diff --git a/fabfile/databases/mysql.py b/fabfile/databases/mysql.py
index 3338666da5..0a3b11b76b 100644
--- a/fabfile/databases/mysql.py
+++ b/fabfile/databases/mysql.py
@@ -6,8 +6,8 @@ def create_database():
     Create the MySQL Mayan EDMS database
     """
     run('echo "CREATE DATABASE %(database_name)s;" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
-    run('echo "CREATE USER \'%(database_username)s\'@\'localhost\' IDENTIFIED BY \'%(database_password)s\';" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
-    run('echo "GRANT ALL PRIVILEGES ON %(database_name)s.* TO \'%(database_username)s\'@\'localhost\' WITH GRANT OPTION; |  mysql -u root --password=%(database_manager_admin_password)s' % env)
+    run('echo "CREATE USER \'%(database_username)s\'@\'%(database_host)s\' IDENTIFIED BY \'%(database_password)s\';" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
+    run('echo "GRANT ALL PRIVILEGES ON %(database_name)s.* TO \'%(database_username)s\'@\'%(database_host)s\' WITH GRANT OPTION;" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
 
 
 def drop_database():