diff --git a/Allura/allura/lib/widgets/resources/js/usermentions-helper.js b/Allura/allura/lib/widgets/resources/js/usermentions-helper.js
index f53ee1b..d1d0ea8 100644
--- a/Allura/allura/lib/widgets/resources/js/usermentions-helper.js
+++ b/Allura/allura/lib/widgets/resources/js/usermentions-helper.js
@@ -31,7 +31,7 @@
 }
 
 CodeMirror.registerHelper('hint', 'alluraUserMentions', function (editor) {
-    var word = /[\w-]+/;
+    var word = /[^@]+/;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
     var tokenType = editor.getTokenTypeAt(cur);