diff --git a/common/services/PostService.php b/common/services/PostService.php
index caa3db5..42a31e6 100644
--- a/common/services/PostService.php
+++ b/common/services/PostService.php
@@ -100,7 +100,7 @@ public static function contentReplaceAtUser($content, $model)
 
     public static function parseUsername($content)
     {
-        preg_match_all('/@(\S{4,255}) /', $content, $matches);
+        preg_match_all('/@(\S{4,255})\b/', $content, $matches);
         if (empty($matches[1])) {
             return [];
         }