diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 36656138..de3d2b5e 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -652,6 +652,10 @@ Callbacks = {
     },
 
     addUser: function(data) {
+        var user = findUserlistItem(data.name);
+        // Remove previous instance of user, if there was one
+        if(user !== null)
+            user.remove();
         var div = $("<div/>")
             .addClass("userlist_item");
         var flair = $("<span/>").appendTo(div);
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index f1d0fa36..2b3153c9 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -60,9 +60,14 @@ function formatURL(data) {
 
 function findUserlistItem(name) {
     var children = $("#userlist .userlist_item");
+    if(children.length == 0)
+        return null;
+    name = name.toLowerCase();
     for(var i in children) {
         var child = children[i];
-        if(child.children[1].innerHTML === name)
+        if(typeof child.children === "undefined")
+            continue;
+        if($(child.children[1]).text().toLowerCase() == name)
             return $(child);
     }
     return null;