diff --git a/server/modules/authenticator/MySQLAuth/dbusers.cc b/server/modules/authenticator/MySQLAuth/dbusers.cc
index 3dfde6cae..873648517 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@@ -415,6 +415,10 @@ int validate_mysql_user(MYSQL_AUTH* instance,
                 rval = MXS_AUTH_FAILED_DB;
             }
         }
+        else
+        {
+            rval = MXS_AUTH_FAILED_WRONG_PASSWORD;
+        }
     }
 
     return rval;