diff --git a/node/handler/PadMessageHandler.js b/node/handler/PadMessageHandler.js
index 45bb90eff..bf117c40a 100644
--- a/node/handler/PadMessageHandler.js
+++ b/node/handler/PadMessageHandler.js
@@ -186,21 +186,10 @@ exports.handleMessage = function(client, message)
     handleChatMessage(client, message);
   }
   else if(message.type == "COLLABROOM" &&
-          message.data.type == "CLIENT_MESSAGE")
+          message.data.type == "CLIENT_MESSAGE" &&
+          message.data.payload.type == "suggestUserName")
   {
-    if(message.data.payload.type == "suggestUserName")
-    {
-      handleSuggestUserName(client, message);
-    }
-    else if (message.data.payload.type == "padoptions")
-    {
-      messageLogger.info("Handler not implemented for payload type: " + message.data.payload.type);
-      //handlePadOptions
-    }
-    else
-    {
-      messageLogger.warn("Dropped COLLABROOM CLIENT_MESSAGE message, unknown Message Type " + message.type);
-    }
+    handleSuggestUserName(client, message);
   }
   //if the message type is unknown, throw an exception
   else