diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index 567aeaa7..8b7304f4 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{nick}}</a>
+<a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a>
 is now known as
-<a href="#" class="user" data-name="{{text}}">{{mode}}{{newnick}}</a>
+<a href="#" class="user" data-name="{{newnick}}">{{mode}}{{newnick}}</a>
diff --git a/client/views/actions/topic_set_by.tpl b/client/views/actions/topic_set_by.tpl
index d842fa67..120c757d 100644
--- a/client/views/actions/topic_set_by.tpl
+++ b/client/views/actions/topic_set_by.tpl
@@ -1 +1 @@
-Topic set by {{nick}} on {{localeDate when}}
+Topic set by <a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a> on {{localeDate when}}
diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index 9c91d2ac..ced3326b 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -5,31 +5,31 @@
 </div>
 {{#if whois.account}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nickname}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	is logged in as <b>{{whois.account}}</b>
 </div>
 {{/if}}
 {{#if whois.channels}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nickname}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	is on the following channels: {{{parse whois.channels}}}
 </div>
 {{/if}}
 {{#if whois.server}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nickname}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	is connected to {{whois.server}} <i>({{whois.server_info}})</i>
 </div>
 {{/if}}
 {{#if whois.secure}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nickname}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	is using a secure connection
 </div>
 {{/if}}
 {{#if whois.away}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nickname}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
 	is away <i>({{whois.away}})</i>
 </div>
 {{/if}}