Index: modules/user/user.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.tokens.inc,v
retrieving revision 1.3
diff -u -p -r1.3 user.tokens.inc
--- modules/user/user.tokens.inc	4 Dec 2009 16:49:48 -0000	1.3
+++ modules/user/user.tokens.inc	7 Mar 2010 04:11:39 -0000
@@ -86,7 +86,7 @@ function user_tokens($type, $tokens, 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;