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