diff --git a/application/plugins/ChatMessagePlugin.php b/application/plugins/ChatMessagePlugin.php
index b64712e0..f1e24edc 100644
--- a/application/plugins/ChatMessagePlugin.php
+++ b/application/plugins/ChatMessagePlugin.php
@@ -401,7 +401,8 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 			return $player->nickname;
 		}
 
-		return null;
+		//returns the text given if nothing matches
+		return $login;
 	}
 
 	/**