diff --git a/modules/user/user.tokens.inc b/modules/user/user.tokens.inc
index 8dcea4b..a02f566 100644
--- a/modules/user/user.tokens.inc
+++ b/modules/user/user.tokens.inc
@@ -90,7 +90,12 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
           break;
 
         case 'mail':
-          $replacements[$original] = $sanitize ? check_plain($account->mail) : $account->mail;
+          if (empty($account->mail)) {
+            $replacements[$original] = '';
+          }
+          else {
+            $replacements[$original] = $sanitize ? check_plain($account->mail) : $account->mail;
+          }
           break;
 
         case 'url':