diff --git a/code/chat.js b/code/chat.js
index 919ce854..df42dd2a 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -410,12 +410,12 @@ window.chat.renderMsg = function(msg, nick, time, team, msgToPlayer, systemNarro
   var s = 'style="cursor:pointer; color:'+color+'"';
   var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
   var i = ['<span class="invisep">&lt;</span>', '<span class="invisep">&gt;</span>'];
-  return '<tr><td>'+t+'</td><td>'+i[0]+'<mark class="nickname" onclick="window.chat.nicknameClicked(event, \'' + nick + '\')" ' + s + '>'+ nick+'</mark>'+i[1]+'</td><td>'+msg+'</td></tr>';
+  return '<tr><td>'+t+'</td><td>'+i[0]+'<mark class="nickname" ' + s + '>'+ nick+'</mark>'+i[1]+'</td><td>'+msg+'</td></tr>';
 }
 
 window.chat.addNickname= function(nick){
     var c = document.getElementById("chattext");
-    c.value = [c.value, nick, " "].join(" ").trim() + " ";
+    c.value = [c.value.trim(), nick].join(" ").trim() + " ";
     c.focus()
 }
 
@@ -589,7 +589,11 @@ window.chat.setup = function() {
   window.requests.addRefreshFunction(chat.request);
 
   var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res';
-  $('#chatinput mark').addClass(cls)
+  $('#chatinput mark').addClass(cls);
+
+  $(window).on('click', '.nickname', function(event) {
+    window.chat.nicknameClicked(event, $(this).text());
+  });
 }
 
 
diff --git a/style.css b/style.css
index fc043a41..d8f6743b 100644
--- a/style.css
+++ b/style.css
@@ -68,6 +68,10 @@ body {
   color: #fff;
 }
 
+.nickname {
+  cursor: pointer !important;
+}
+
 a {
   color: #ffce00;
   cursor: pointer;