diff --git a/models/update.rb b/models/update.rb
index dbccae6f..c225c8fb 100644
--- a/models/update.rb
+++ b/models/update.rb
@@ -29,7 +29,7 @@ def url=(the_url)
   def to_html
     out = CGI.escapeHTML(text)
     out.gsub!(/(^|\s+)@(\w+)/) do |match|
-      if u = User.first(:username => /#{$2}/i)
+      if u = User.first(:username => /^#{$2}$/i)
         "#{$1}<a href='/users/#{u.username}'>@#{$2}</a>"
       else
         match