diff --git a/src/plugins/inputs/msg.js b/src/plugins/inputs/msg.js
index 57a7d1cf..94a6450d 100644
--- a/src/plugins/inputs/msg.js
+++ b/src/plugins/inputs/msg.js
@@ -23,6 +23,8 @@ exports.input = function(network, chan, cmd, args) {
 		if (typeof channel !== "undefined") {
 			network.irc.emit("privmsg", {
 				nick: network.irc.user.nick,
+				ident: network.irc.user.username,
+				hostname: network.irc.user.host,
 				target: channel.name,
 				message: msg,
 			});
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index c6714258..c047f763 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -45,7 +45,7 @@ module.exports = function(irc, network) {
 		const self = data.nick === irc.user.nick;
 
 		// Check if the sender is in our ignore list
-		const shouldIgnore = network.ignoreList.some(function(entry) {
+		const shouldIgnore = !self && network.ignoreList.some(function(entry) {
 			return Helper.compareHostmask(entry, data);
 		});