--- user.module	2009-03-13 15:34:01.000000000 -0400
+++ user.module.user_mail_tokens-fix-2	2009-03-13 15:42:15.000000000 -0400
@@ -2074,7 +2074,7 @@
   $tokens = array(
     '!username' => $account->name,
     '!site' => variable_get('site_name', 'Drupal'),
-    '!login_url' => user_pass_reset_url($account),
+    '!login_url' => (isset($account->pass) && isset($account->login)) ? user_pass_reset_url($account) : url('user/login'),
     '!uri' => $base_url,
     '!uri_brief' => preg_replace('!^https?://!', '', $base_url),
     '!mailto' => $account->mail,