diff --git a/static/js/chat.js b/static/js/chat.js
index aaefbcc5..1d6ec5b5 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -48,9 +48,9 @@ socket.on("chat.all", function(inp)
     $("#favicon").attr("href", "static/images/highlogo.png");
     unseen = true;
   }
-  var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6);
+  var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6);
 	$("#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));
+  var in_text = document.createTextNode(data.substring(data.indexOf(": ")));
   $("#chatall li:last")[0].appendChild(in_text);
   document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight
 });
@@ -75,9 +75,9 @@ socket.on("chat,"+chan.toLowerCase(), function(data)
       blink_interval = setInterval(chat_blink, 2000);
     }
   }
-  var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6);
+  var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6);
 	$("#chatchannel").append("<li><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>");
-  var in_text = document.createTextNode(data.substring(8));
+  var in_text = document.createTextNode(data.substring(data.indexOf(": ")));
   $("#chatchannel li:last")[0].appendChild(in_text);
   document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight
 });