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 11e3643..2b5e608 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(?:.*\\|\\s)?(\\w*)$");
+    private static final Pattern PATTERN = Pattern.compile("^\\[\\+\\]\\s(.*(?=\\s\\|))?(?:\\s\\|\\s)?(\\w*)$");
 
     private String username;