diff --git a/roles/beaker/server/tasks/main.yml b/roles/beaker/server/tasks/main.yml
index ab3938caf8..cc9d774a37 100644
--- a/roles/beaker/server/tasks/main.yml
+++ b/roles/beaker/server/tasks/main.yml
@@ -48,8 +48,11 @@
 - name: create the beaker database
   mysql_db: name=beaker state=present
 
-- name: create beaker user
-  mysql_user: name={{beaker_server_admin_user}} password={{beaker_server_admin_pass}} priv=beaker.*:ALL,GRANT state=present
+- name: create beaker database user
+  mysql_user:
+    name: "{{ beaker_db_user }}"
+    password: "{{ beaker_db_password }}"
+    priv: "beaker.*:ALL,GRANT state=present"
 
 - name: initialize beaker database
   command: "beaker-init -u {{beaker_server_admin_user}} -p {{beaker_server_admin_pass}} -e {{beaker_server_email}}"