diff --git a/code/chat.js b/code/chat.js
index 919ce854..6efaf839 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -241,7 +241,8 @@ window.chat.renderFull = function(oldMsgsWereAdded) {
 // common
 //
 
-window.chat.nicknameClicked = function(event, nickname) {
+window.chat.nicknameClicked = function(event, nickname, dom) {
+  nickname = nickname ? nickname : $(dom).text();
   var hookData = { event: event, nickname: nickname };
   
   if (window.runHooks('nicknameClicked', hookData)) {
@@ -410,7 +411,7 @@ 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){
@@ -589,7 +590,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, null, this);
+  });
 }