From 48f06a164becf83d3314708bb4640c7f6b107495 Mon Sep 17 00:00:00 2001
From: Bob Vincent <bobvin@pillars.net>
Date: Fri, 20 May 2011 17:22:43 -0400
Subject: [PATCH] Issue #401266 by pillarsdotnet: Call user_load() from user_mail_tokens() if "login" or "pass" properties are missing.

---
 modules/user/user.module |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/user/user.module b/modules/user/user.module
index a4dfe773ebe85e8b24306c44e697e8a672b49633..4e167375fa16a1f1f33608007bb3ac0f2fdf9adf 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2118,6 +2118,9 @@ function theme_user_signature($signature) {
  */
 function user_mail_tokens($account, $language) {
   global $base_url;
+  if (!isset($user->pass) || !isset($user->login)) {
+    $user = user_load($user->uid);
+  }
   $tokens = array(
     '!username' => $account->name,
     '!site' => variable_get('site_name', 'Drupal'),
-- 
1.7.4.1