diff --git a/server/server.js b/server/server.js
index a6e16b43..88d86a8e 100755
--- a/server/server.js
+++ b/server/server.js
@@ -39,10 +39,10 @@ io.on('connection', function(socket){
 
   socket.on('namechange', function(data)
   {
-    if(name.length < 9)
+    if(name.length < 9 && name.indexOf(" ") == -1)
     {
-      io.sockets.emit('chat,'+coll, name + " changed name to " + data);
-      io.sockets.emit('chat.all', [name + " changed name to " + data, coll]);
+      io.sockets.emit('chat,'+coll, name + ": changed name to " + data);
+      io.sockets.emit('chat.all', [name + ": changed name to " + data, coll]);
       name = data;
     }
   });
diff --git a/static/js/chat.js b/static/js/chat.js
index e62cf2bd..87002ae2 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -49,7 +49,7 @@ socket.on("chat.all", function(inp)
     unseen = true;
   }
   var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6);
-	$("#chatall").append("<li title='"+inp[1]+"'><span style='color:"+color+";'>"+data.substring(0,8)+"</span></li>");
+	$("#chatall").append("<li title='"+inp[1]+"'><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>");
   var in_text = document.createTextNode(data.substring(8));
   $("#chatall li:last")[0].appendChild(in_text);
   document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight