diff --git a/src/client/java/net/legitimoose/bot/chat/matcher/JoinMatcher.java b/src/client/java/net/legitimoose/bot/chat/matcher/JoinMatcher.java
index 46d570c..11e3643 100644
--- a/src/client/java/net/legitimoose/bot/chat/matcher/JoinMatcher.java
+++ b/src/client/java/net/legitimoose/bot/chat/matcher/JoinMatcher.java
@@ -13,7 +13,7 @@
  * These are in the format <code>[+] Rank | username</code> or <code>[+] username</code>
  */
 public class JoinMatcher implements MessageMatcher {
-    private static final Pattern PATTERN = Pattern.compile("^\\[\\+][\\s\\u00A0](?:([^|]+)[\\s\\u00A0]\\|[\\s\\u00A0])?(\\S+)");
+    private static final Pattern PATTERN = Pattern.compile("^\\[\\+\\]\\s(?:.*\\|\\s)?(\\w*)$");
 
     private String username;
 
diff --git a/src/client/java/net/legitimoose/bot/chat/matcher/LeaveMatcher.java b/src/client/java/net/legitimoose/bot/chat/matcher/LeaveMatcher.java
index f0d9e9d..fabefac 100644
--- a/src/client/java/net/legitimoose/bot/chat/matcher/LeaveMatcher.java
+++ b/src/client/java/net/legitimoose/bot/chat/matcher/LeaveMatcher.java
@@ -13,7 +13,7 @@
  * These are in the format <code>[-] Rank | username</code>. Almost identical to {@link SwitchMatcher}
  */
 public class LeaveMatcher implements MessageMatcher {
-    private static final Pattern PATTERN = Pattern.compile("^\\[-]\\s*(?:[^|]+\\|\\s*)?(\\S+)");
+    private static final Pattern PATTERN = Pattern.compile("^\\[-\\]\\s(?:.*\\|\\s)?(\\w*)$");
 
     private String username;
 
diff --git a/src/client/java/net/legitimoose/bot/chat/matcher/SwitchMatcher.java b/src/client/java/net/legitimoose/bot/chat/matcher/SwitchMatcher.java
index 0bc67c4..bc75d6d 100644
--- a/src/client/java/net/legitimoose/bot/chat/matcher/SwitchMatcher.java
+++ b/src/client/java/net/legitimoose/bot/chat/matcher/SwitchMatcher.java
@@ -13,7 +13,7 @@
  * These are in the format <code>[→] Rank | Username</code>
  */
 public class SwitchMatcher implements MessageMatcher {
-    private static final Pattern PATTERN = Pattern.compile("^\\[→]\\s*(?:[^|]+\\|\\s*)?(\\S+)");
+    private static final Pattern PATTERN = Pattern.compile("^\\[→\\]\\s(?:.*\\|\\s)?(\\w*)$");
 
     private String username;