diff --git a/fabfile/__init__.py b/fabfile/__init__.py
index c770c891b0..1b3365fa7d 100644
--- a/fabfile/__init__.py
+++ b/fabfile/__init__.py
@@ -49,5 +49,6 @@ def uninstall():
 
     if env.drop_database:
         database.drop_database()
+        database.drop_username()
 
 
diff --git a/fabfile/databases/__init__.py b/fabfile/databases/__init__.py
index 32975466b1..ad48ada637 100644
--- a/fabfile/databases/__init__.py
+++ b/fabfile/databases/__init__.py
@@ -27,3 +27,13 @@ def drop_database():
     if env.database_manager == DB_MYSQL:
         mysql.drop_database()
 
+
+@task
+def drop_username():
+    """
+    Drop Mayan EDMS's username
+    """
+    print(green('Droping Mayan EDMS username', bold=True))
+
+    if env.database_manager == DB_MYSQL:
+        mysql.drop_username()
diff --git a/fabfile/databases/mysql.py b/fabfile/databases/mysql.py
index eeed8f3412..43d947bcb4 100644
--- a/fabfile/databases/mysql.py
+++ b/fabfile/databases/mysql.py
@@ -15,5 +15,13 @@ def drop_database():
     Drop MySQL's Mayan EDMS's database
     """
     with settings(warn_only=True):
-        run('echo "drop database %(database_name)s;" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
+        run('echo "DROP DATABASE %(database_name)s;" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
+
+
+def drop_username():
+    """
+    Drop MySQL's Mayan EDMS's username
+    """
+    with settings(warn_only=True):
+        run('echo "DROP USER \'%(database_username)s\'@\'%(database_host)s\';" |  mysql -u root --password=%(database_manager_admin_password)s' % env)