diff --git a/modules/user/user.tokens.inc b/modules/user/user.tokens.inc
index baee793bee3..569dd1cef4c 100644
--- a/modules/user/user.tokens.inc
+++ b/modules/user/user.tokens.inc
@@ -86,7 +86,7 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
           break;
 
         case 'name':
-          $name = ($account->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $account->name;
+          $name = format_username($account);
           $replacements[$original] = $sanitize ? filter_xss($name) : $name;
           break;