diff --git a/client/css/style.css b/client/css/style.css
index 315eddb6..cd071a0c 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -747,6 +747,7 @@ button,
 }
 
 #chat.no-colors .from .user,
+#chat.no-colors .text .user,
 #chat.no-colors .sidebar .user {
 	color: #50a656 !important;
 }
diff --git a/client/themes/crypto.css b/client/themes/crypto.css
index a4106a4f..02716e1a 100644
--- a/client/themes/crypto.css
+++ b/client/themes/crypto.css
@@ -113,6 +113,7 @@ a:hover,
 }
 
 #chat.no-colors .from .user,
+#chat.no-colors .text .user,
 #chat.no-colors .sidebar .user {
 	color: #000 !important;
 	font-weight: bold;
diff --git a/client/themes/morning.css b/client/themes/morning.css
index c4e7a2e8..900fc0e3 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -93,11 +93,13 @@ QUIT #d0907d
 
 /* Nicknames */
 #chat.no-colors .from .user,
+#chat.no-colors .text .user,
 #chat.no-colors .sidebar .user {
 	color: #b0bacf !important;
 }
 
 #chat.no-colors .from .user:hover,
+#chat.no-colors .text .user:hover,
 #chat.no-colors .sidebar .user:hover {
 	color: #fefefe !important;
 }
diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css
index e6e1b635..e92187f9 100644
--- a/client/themes/zenburn.css
+++ b/client/themes/zenburn.css
@@ -123,11 +123,13 @@ body {
 
 /* Nicknames */
 #chat.no-colors .from .user,
+#chat.no-colors .text .user,
 #chat.no-colors .sidebar .user {
 	color: #bc8cbc !important;
 }
 
 #chat.no-colors .from .user:hover,
+#chat.no-colors .text .user:hover,
 #chat.no-colors .sidebar .user:hover {
 	color: #dcdccc !important;
 }
diff --git a/client/views/actions/action.tpl b/client/views/actions/action.tpl
index 1fcced98..f840a9ce 100644
--- a/client/views/actions/action.tpl
+++ b/client/views/actions/action.tpl
@@ -1,2 +1,2 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 <span class="action-text">{{{parse text}}}</span>
diff --git a/client/views/actions/ctcp.tpl b/client/views/actions/ctcp.tpl
index dd4e95d9..444ffdef 100644
--- a/client/views/actions/ctcp.tpl
+++ b/client/views/actions/ctcp.tpl
@@ -1,2 +1,2 @@
-<a href="#" class="user" data-name="{{from}}">{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{from}}</a>
 <b>{{ctcpType}}</b> {{{parse ctcpMessage}}}
diff --git a/client/views/actions/invite.tpl b/client/views/actions/invite.tpl
index 6b9cecac..74098399 100644
--- a/client/views/actions/invite.tpl
+++ b/client/views/actions/invite.tpl
@@ -1,9 +1,9 @@
-<a href="#" class="user" data-name="{{from}}">{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{from}}</a>
 invited
 {{#if invitedYou}}
 	you
 {{else}}
-	<a href="#" class="user" data-name="{{invited}}">{{invited}}</a>
+	<a href="#" class="user" data-name="{{invited}}" style="color:#{{stringcolor invited}}">{{invited}}</a>
 {{/if}}
 to
 {{{parse channel}}}
diff --git a/client/views/actions/join.tpl b/client/views/actions/join.tpl
index 2eaf2a93..5e3f48c3 100644
--- a/client/views/actions/join.tpl
+++ b/client/views/actions/join.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 <i class="hostmask">({{hostmask}})</i>
 has joined the channel
diff --git a/client/views/actions/kick.tpl b/client/views/actions/kick.tpl
index e41feb16..8dc44a29 100644
--- a/client/views/actions/kick.tpl
+++ b/client/views/actions/kick.tpl
@@ -1,6 +1,6 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 has kicked
-<a href="#" class="user" data-name="{{target}}">{{target}}</a>
+<a href="#" class="user" data-name="{{target}}" style="color:#{{stringcolor target}}">{{target}}</a>
 {{#if text}}
 	<i class="part-reason">({{{parse text}}})</i>
 {{/if}}
diff --git a/client/views/actions/mode.tpl b/client/views/actions/mode.tpl
index 56b5aa97..c162ac2a 100644
--- a/client/views/actions/mode.tpl
+++ b/client/views/actions/mode.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 sets mode
 {{{parse text}}}
diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index 2481e914..dc168ffa 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a>
+<a href="#" class="user" data-name="{{nick}}" style="color:#{{stringcolor nick}}">{{mode}}{{nick}}</a>
 is now known as
-<a href="#" class="user" data-name="{{new_nick}}">{{mode}}{{new_nick}}</a>
+<a href="#" class="user" data-name="{{new_nick}}" style="color:#{{stringcolor new_nick}}">{{mode}}{{new_nick}}</a>
diff --git a/client/views/actions/part.tpl b/client/views/actions/part.tpl
index fd2eb23f..36415248 100644
--- a/client/views/actions/part.tpl
+++ b/client/views/actions/part.tpl
@@ -1,4 +1,4 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 <i class="hostmask">({{hostmask}})</i>
 has left the channel
 {{#if text}}
diff --git a/client/views/actions/quit.tpl b/client/views/actions/quit.tpl
index 3f0933f8..a373f659 100644
--- a/client/views/actions/quit.tpl
+++ b/client/views/actions/quit.tpl
@@ -1,4 +1,4 @@
-<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 <i class="hostmask">({{hostmask}})</i>
 has quit
 {{#if text}}
diff --git a/client/views/actions/topic.tpl b/client/views/actions/topic.tpl
index 92fe29ae..d79e3eb8 100644
--- a/client/views/actions/topic.tpl
+++ b/client/views/actions/topic.tpl
@@ -1,5 +1,5 @@
 {{#if from}}
-	<a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
+	<a href="#" class="user" data-name="{{from}}" style="color:#{{stringcolor from}}">{{mode}}{{from}}</a>
 	has changed the topic to:
 {{else}}
 	The topic is:
diff --git a/client/views/actions/topic_set_by.tpl b/client/views/actions/topic_set_by.tpl
index 120c757d..9a31e293 100644
--- a/client/views/actions/topic_set_by.tpl
+++ b/client/views/actions/topic_set_by.tpl
@@ -1 +1,3 @@
-Topic set by <a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a> on {{localeDate when}}
+Topic set by
+<a href="#" class="user" data-name="{{nick}}" style="color:#{{stringcolor nick}}">{{mode}}{{nick}}</a>
+on {{localeDate when}}
diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index ced3326b..7f8f5112 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -1,35 +1,35 @@
 <div>
-	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
 	<i class="hostmask">({{whois.user}}@{{whois.host}})</i>:
 	<b>{{whois.real_name}}</b>
 </div>
 {{#if whois.account}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor 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.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor 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.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor 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.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
 	is using a secure connection
 </div>
 {{/if}}
 {{#if whois.away}}
 <div>
-	<a href="#" class="user" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<a href="#" class="user" data-name="{{whois.nick}}" style="color:#{{stringcolor whois.nick}}">{{whois.nick}}</a>
 	is away <i>({{whois.away}})</i>
 </div>
 {{/if}}