diff --git a/src/plugins/irc-events/kick.js b/src/plugins/irc-events/kick.js
index cbe525a3..6b3174e6 100644
--- a/src/plugins/irc-events/kick.js
+++ b/src/plugins/irc-events/kick.js
@@ -11,10 +11,12 @@ module.exports = function(irc, network) {
 			return;
 		}
 
+		const user = chan.findUser(data.kicked);
+
 		if (data.kicked === irc.user.nick) {
 			chan.users = [];
 		} else {
-			chan.users = _.without(chan.users, _.find(chan.users, {nick: data.kicked}));
+			chan.users = _.without(chan.users, user);
 		}
 
 		client.emit("users", {
@@ -24,7 +26,7 @@ module.exports = function(irc, network) {
 		var msg = new Msg({
 			type: Msg.Type.KICK,
 			time: data.time,
-			mode: chan.getMode(data.nick),
+			mode: user.mode,
 			from: data.nick,
 			target: data.kicked,
 			text: data.message || "",
diff --git a/src/plugins/irc-events/mode.js b/src/plugins/irc-events/mode.js
index 28f94052..266515bb 100644
--- a/src/plugins/irc-events/mode.js
+++ b/src/plugins/irc-events/mode.js
@@ -81,7 +81,7 @@ module.exports = function(irc, network) {
 				return;
 			}
 
-			const user = _.find(targetChan.users, {nick: mode.param});
+			const user = targetChan.findUser(mode.param);
 			if (!user) {
 				return;
 			}
diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index 7c8b61ad..af10f233 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -1,6 +1,5 @@
 "use strict";
 
-var _ = require("lodash");
 var Msg = require("../../models/msg");
 
 module.exports = function(irc, network) {
@@ -25,7 +24,7 @@ module.exports = function(irc, network) {
 		}
 
 		network.channels.forEach((chan) => {
-			var user = _.find(chan.users, {nick: data.nick});
+			const user = chan.findUser(data.nick);
 			if (typeof user === "undefined") {
 				return;
 			}
diff --git a/src/plugins/irc-events/part.js b/src/plugins/irc-events/part.js
index 001bbc71..70376cdf 100644
--- a/src/plugins/irc-events/part.js
+++ b/src/plugins/irc-events/part.js
@@ -18,7 +18,7 @@ module.exports = function(irc, network) {
 				chan: chan.id
 			});
 		} else {
-			var user = _.find(chan.users, {nick: from});
+			const user = chan.findUser(from);
 			chan.users = _.without(chan.users, user);
 			client.emit("users", {
 				chan: chan.id
diff --git a/src/plugins/irc-events/quit.js b/src/plugins/irc-events/quit.js
index 3882eadc..fd0c3caa 100644
--- a/src/plugins/irc-events/quit.js
+++ b/src/plugins/irc-events/quit.js
@@ -7,8 +7,7 @@ module.exports = function(irc, network) {
 	var client = this;
 	irc.on("quit", function(data) {
 		network.channels.forEach((chan) => {
-			var from = data.nick;
-			var user = _.find(chan.users, {nick: from});
+			const user = chan.findUser(data.nick);
 			if (typeof user === "undefined") {
 				return;
 			}
@@ -22,7 +21,7 @@ module.exports = function(irc, network) {
 				mode: user.mode || "",
 				text: data.message || "",
 				hostmask: data.ident + "@" + data.hostname,
-				from: from
+				from: data.nick
 			});
 			chan.pushMessage(client, msg);
 		});