diff --git a/modules/adminapi/mod_dba.cc b/modules/adminapi/mod_dba.cc
index 00fe68d7c..6d1641304 100644
--- a/modules/adminapi/mod_dba.cc
+++ b/modules/adminapi/mod_dba.cc
@@ -1344,8 +1344,10 @@ shcore::Value Dba::create_cluster(const shcore::Argument_list &args) {
     try {
       if (!replication_user.empty()) {
         log_debug("Removing replication user '%s'", replication_user.c_str());
-        group_session->query("DROP USER IF EXISTS /*(*/" + replication_user +
-                             "/*)*/");
+        group_session->query("DROP USER IF EXISTS /*(*/'" + replication_user +
+                             "'@'%'/*)*/");
+        group_session->query("DROP USER IF EXISTS /*(*/'" + replication_user +
+                             "'@'localhost'/*)*/");
       }
 
       throw;