diff --git a/mysql/database.sls b/mysql/database.sls
index 35caa21..7f3daa6 100644
--- a/mysql/database.sls
+++ b/mysql/database.sls
@@ -35,7 +35,7 @@ include:
 
 {{ state_id }}_load:
   cmd.wait:
-    - name: mysql -u root -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema
+    - name: mysql -u {{ mysql_root_user }} -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema
     - watch:
       - file: {{ state_id }}_schema
       - mysql_database: {{ state_id }}
diff --git a/mysql/server.sls b/mysql/server.sls
index e5761ed..e9fbb55 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -15,11 +15,11 @@ mysql_debconf_utils:
 
 mysql_debconf:
   debconf.set:
-    - name: mysql-server
+    - name: {{ mysql.server }}
     - data:
-        'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'}
-        'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}
-        'mysql-server/start_on_boot': {'type': 'boolean', 'value': 'true'}
+        '{{ mysql.server }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'}
+        '{{ mysql.server }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}
+        '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
     - require_in:
       - pkg: mysqld
     - require:
@@ -27,8 +27,8 @@ mysql_debconf:
 {% elif os_family == 'RedHat' or os_family == 'Suse' or os_family == 'Arch' %}
 mysql_root_password:
   cmd.run:
-    - name: mysqladmin --user root password '{{ mysql_root_password|replace("'", "'\"'\"'") }}'
-    - unless: mysql --user root --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;"
+    - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}'
+    - unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;"
     - require:
       - service: mysqld
 {% endif %}