diff --git a/server/core/config_runtime.c b/server/core/config_runtime.c
index a84e77fb6..98d4d312e 100644
--- a/server/core/config_runtime.c
+++ b/server/core/config_runtime.c
@@ -280,12 +280,22 @@ bool runtime_alter_server(SERVER *server, char *key, char *value)
     {
         server_update_port(server, atoi(value));
     }
-    else if (strcmp(key, "monuser") == 0)
+    else if (strcmp(key, "monuser") == 0 || strcmp(key, "monitoruser") == 0)
     {
+        if (strcmp(key, "monuser") == 0)
+        {
+            MXS_WARNING("Use of `monuser` is deprecated, use `monitoruser` instead.");
+        }
+
         server_update_credentials(server, value, server->monpw);
     }
-    else if (strcmp(key, "monpw") == 0)
+    else if (strcmp(key, "monpw") == 0 || strcmp(key, "monitorpw") == 0)
     {
+        if (strcmp(key, "monpw") == 0)
+        {
+            MXS_WARNING("Use of `monpw` is deprecated, use `monitorpw` instead.");
+        }
+
         server_update_credentials(server, server->monuser, value);
     }
     else
diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c
index abd8355a4..a221874ca 100644
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@@ -1495,8 +1495,8 @@ struct subcommand alteroptions[] =
         "\n"
         "address               Server address\n"
         "port                  Server port\n"
-        "monuser               Monitor user for this server\n"
-        "monpw                 Monitor password for this server\n"
+        "monitoruser           Monitor user for this server\n"
+        "monitorpw             Monitor password for this server\n"
         "ssl                   Enable SSL, value must be 'required'\n"
         "ssl_key               Path to SSL private key\n"
         "ssl_cert              Path to SSL certificate\n"