diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index 73c790f4..1c93cb97 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
-<span role="button" class="user {{colorClass nick}}" data-name="{{nick}}">{{mode}}{{nick}}</span>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 is now known as
 <span role="button" class="user {{colorClass new_nick}}" data-name="{{new_nick}}">{{mode}}{{new_nick}}</span>
diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index 51929f4c..a1bfc3b7 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -36,9 +36,9 @@ module.exports = function(irc, network) {
 			});
 			msg = new Msg({
 				time: data.time,
+				from: data.nick,
 				type: Msg.Type.NICK,
 				mode: chan.getMode(data.new_nick),
-				nick: data.nick,
 				new_nick: data.new_nick,
 				self: self
 			});
diff --git a/src/userLog.js b/src/userLog.js
index d8ce8a8b..4b3020f8 100644
--- a/src/userLog.js
+++ b/src/userLog.js
@@ -37,7 +37,9 @@ module.exports.write = function(user, network, chan, msg) {
 
 		line += msg.type;
 
-		if (msg.text) {
+		if (msg.new_nick) { // `/nick <new_nick>`
+			line += ` ${msg.new_nick}`;
+		} else if (msg.text) {
 			line += ` ${msg.text}`;
 		}
 	}