diff --git a/std/player/comm.c b/std/player/comm.c
index 6ab51bd..669ef40 100644
--- a/std/player/comm.c
+++ b/std/player/comm.c
@@ -2207,7 +2207,7 @@
     // Lookahead und Lookbehind assertions um die Whitespaces um das Wort
     // nicht in den Match einzuschliessen (und zu ersetzen).
     string tmp = regreplace(msg,
-                    sprintf("(?<=\\s)@%s(?=\\s*)",getuid(ME)),
+                    sprintf("(?<=\\s){0,1}@%s(?=\\s*){0,1}",getuid(ME)),
                     sprintf("%%^mention%%^@%s%%^normal%%^",
                             capitalize(getuid(ME))),
                     RE_PCRE|RE_GLOBAL|RE_CASELESS);