diff --git a/client/index.html b/client/index.html
index 9bea98c3..a6f00ec3 100644
--- a/client/index.html
+++ b/client/index.html
@@ -143,14 +143,14 @@
 							</div>
 							<div class="col-sm-6">
 								<label class="opt">
-									<input type="checkbox" name="nick">
-									Show nick changes
+									<input type="checkbox" name="part">
+									Show parts
 								</label>
 							</div>
 							<div class="col-sm-6">
 								<label class="opt">
-									<input type="checkbox" name="part">
-									Show parts
+									<input type="checkbox" name="nick">
+									Show nick changes
 								</label>
 							</div>
 							<div class="col-sm-6">
diff --git a/package.json b/package.json
index 04fc0bcc..b97e114d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.23.3",
+  "version": "0.24.0",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index bdbb9375..51eb9de0 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -6,7 +6,7 @@ module.exports = function(irc, network) {
 	var client = this;
 	irc.on("message", function(data) {
 		var target = data.to;
-		if (target == irc.me) {
+		if (target.toLowerCase() == irc.me.toLowerCase()) {
 			target = data.from;
 		}
 		var chan = _.findWhere(network.channels, {name: target});