diff --git a/src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php b/src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
index d6a4ae40fa..cd3ce046ab 100644
--- a/src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
+++ b/src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,11 +108,11 @@ class PhabricatorRemarkupRuleMention
           'a',
           array(
             'class'   => $class,
-            'href'    => '/p/'.$username.'/',
+            'href'    => '/p/'.$actual_users[$username]['username'].'/',
             'target'  => '_blank',
             'title'   => $actual_users[$username]['realName'],
           ),
-          phutil_escape_html('@'.$username));
+          phutil_escape_html('@'.$actual_users[$username]['username']));
         foreach ($tokens as $token) {
           $engine->overwriteStoredText($token, $tag);
         }