Index: modules/user/user.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.tokens.inc,v
retrieving revision 1.8
diff -u -p -r1.8 user.tokens.inc
--- modules/user/user.tokens.inc	16 Oct 2010 20:09:17 -0000	1.8
+++ modules/user/user.tokens.inc	10 Nov 2010 02:10:08 -0000
@@ -122,9 +122,10 @@ function user_tokens($type, $tokens, arr
       $replacements += token_generate('date', $registered_tokens, array('date' => $account->created), $options);
     }
   }
+
   if ($type == 'current-user') {
-    global $user;
-    $replacements += token_generate('user', $tokens, array('user' => $user), $options);
+    $account = user_load($GLOBALS['user']->uid);
+    $replacements += token_generate('user', $tokens, array('user' => $account), $options);
   }
 
   return $replacements;