diff --git a/server/public/assets/js/chat.js b/server/public/assets/js/chat.js
index d4858083..727d8b41 100755
--- a/server/public/assets/js/chat.js
+++ b/server/public/assets/js/chat.js
@@ -42,7 +42,11 @@ var Chat = {
 
     chat: function(data) {
         if(data.value.length > 150) return;
-        if(data.value.startsWith("/login ")){
+        if(data.value.startsWith("/name ") || data.value.startsWith("/removename")) {
+            data.value = "/help";
+            Chat.chat(data);
+            return;
+        } else if(data.value.startsWith("/login ")){
             Chat.namechange(data.value.substring(7), false);
         } else if(data.value.startsWith("/help")) {
             var add = "";