diff --git a/www/js/channel/chat.js b/www/js/channel/chat.js
index 52d0c49..d1d0bcf 100644
--- a/www/js/channel/chat.js
+++ b/www/js/channel/chat.js
@@ -124,8 +124,15 @@ class chatBox{
 
         //Create username label
         var userLabel = document.createElement('p');
-        userLabel.classList.add("chat-panel-buffer", "chat-entry-username", flair);
-        userLabel.textContent = utils.unescapeEntities(data.user)
+        userLabel.classList.add("chat-panel-buffer", "chat-entry-username", );
+        
+        //Create color span
+        var flairSpan = document.createElement('span');
+        flairSpan.classList.add("chat-entry-flair-span", flair);
+        flairSpan.innerHTML = data.user;
+
+        //Inject flair span into user label before the colon
+        userLabel.innerHTML = `${flairSpan.outerHTML}: `;
 
         //Append user label
         chatEntry.appendChild(userLabel);