diff --git a/Git Formats/Git Common.sublime-syntax b/Git Formats/Git Common.sublime-syntax
index e6d36a01d2..6acb24b373 100644
--- a/Git Formats/Git Common.sublime-syntax	
+++ b/Git Formats/Git Common.sublime-syntax	
@@ -119,7 +119,7 @@ contexts:
 
   username:
     # user reference
-    - match: (\@)[-\w]+\b
+    - match: \B(\@)[-\w]+\b
       scope: meta.reference.username.git entity.name.reference.username.git
       captures:
         1: punctuation.definition.reference.username.git
diff --git a/Git Formats/tests/syntax_test_git_commit b/Git Formats/tests/syntax_test_git_commit
index be00efabf7..5061fc3b9c 100644
--- a/Git Formats/tests/syntax_test_git_commit	
+++ b/Git Formats/tests/syntax_test_git_commit	
@@ -32,6 +32,8 @@ Thanks to @username <name@mail-host.domain>.
 #                        ^ punctuation.separator.email.git
 #                                  ^ punctuation.separator.domain.git
 #                                         ^ punctuation.definition.reference.email.end.git
+Update to actions/checkout@v7
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.reference
 This is a <tag> name <tag.name>
 #         ^^^^^ - meta.reference - entity
 #                    ^^^^^^^^^^ - meta.reference - entity