--- token.module	2009-03-03 10:31:56.000000000 -0600
+++ token.module	2009-03-03 10:32:44.000000000 -0600
@@ -85,14 +85,16 @@ function token_token_values($type, $obje
  *   in the form of: $list[$type][$token] = $description
  */
 function token_token_list($type = 'all') {
-  $tokens['global']['user-name']    = t('The name of the currently logged in user.');
-  $tokens['global']['user-id']      = t('The user ID of the currently logged in user.');
-  $tokens['global']['user-mail']    = t('The email address of the currently logged in user.');
-  $tokens['global']['site-url']     = t('The url of the current Drupal website.');
-  $tokens['global']['site-name']    = t('The name of the current Drupal website.');
-  $tokens['global']['site-slogan']  = t('The slogan of the current Drupal website.');
-  $tokens['global']['site-mail']    = t('The contact email address for the current Drupal website.');
-  $tokens['global']['site-date']    = t("The current date on the site's server.");
+  if ($type == 'all') {
+    $tokens['global']['user-name']    = t('The name of the currently logged in user.');
+    $tokens['global']['user-id']      = t('The user ID of the currently logged in user.');
+    $tokens['global']['user-mail']    = t('The email address of the currently logged in user.');
+    $tokens['global']['site-url']     = t('The url of the current Drupal website.');
+    $tokens['global']['site-name']    = t('The name of the current Drupal website.');
+    $tokens['global']['site-slogan']  = t('The slogan of the current Drupal website.');
+    $tokens['global']['site-mail']    = t('The contact email address for the current Drupal website.');
+    $tokens['global']['site-date']    = t("The current date on the site's server.");
+  }
   return $tokens;
 }