diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 37a663f2..ace79089 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -190,6 +190,10 @@ $('#chatline').keydown(function(ev) {
         }
         if(match != null) {
             words[words.length - 1] = match;
+            if(words.length == 1)
+                words[0] += ": ";
+            else
+                words[words.length - 1] += " ";
             $('#chatline').val(words.join(' '));
         }
         ev.preventDefault();
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 924ca1c8..f0d66b3d 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -21,7 +21,7 @@ function addUser(name, rank, leader) {
     var users = $('#userlist').children();
     for(var i = 0; i < users.length; i++) {
         var othername = users[i].children[1].innerHTML;
-        if(othername > name) {
+        if(othername.toLowerCase() > name.toLowerCase()) {
             $(div).insertBefore(users[i]);
             return;
         }