diff --git a/src/main/java/com/cnaude/purpleirc/IRCMessageQueueWatcher.java b/src/main/java/com/cnaude/purpleirc/IRCMessageQueueWatcher.java
index ed02a1e..ba13bc9 100644
--- a/src/main/java/com/cnaude/purpleirc/IRCMessageQueueWatcher.java
+++ b/src/main/java/com/cnaude/purpleirc/IRCMessageQueueWatcher.java
@@ -118,7 +118,6 @@ public class IRCMessageQueueWatcher {
                                 "(?i)" + user.getNick(),
                                 Matcher.quoteReplacement(plugin.tokenizer.addZeroWidthSpace(user.getNick()))
                         );
-                        plugin.logDebug("Adding ZWS to " + user.getNick());
                     }
                 }
             }
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
index 373aa72..ec132a8 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -1229,13 +1229,18 @@ public class ChatTokenizer {
 
     public String addZeroWidthSpace(String s) {
         if (s.contains("\u200B")) {
+            plugin.logDebug("Nick already contains ZWS: " + s);
             return s;
         }
+        
         if (s.length() > 1) {
             String a = s.substring(0, 1);
             String b = s.substring(1);
-            return a + "\u200B" + b;
+            String n = a + "\u200B" + b;
+            plugin.logDebug("Adding ZWS: " + s + " -> " + n);
+            return n;
         }
+        plugin.logDebug("Nick too short for ZWS: " + s);
         return s;
     }