Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.94
diff -u -p -r1.94 user.admin.inc
--- modules/user/user.admin.inc	9 Jan 2010 23:03:21 -0000	1.94
+++ modules/user/user.admin.inc	11 Jan 2010 10:47:19 -0000
@@ -424,7 +424,7 @@ function user_admin_settings() {
   );
   // These email tokens are shared for all settings, so just define
   // the list once to help ensure they stay in sync.
-  $email_token_help = t('Available variables are:') . ' [site:name], [site:url], [user:name], [user:mail], [site:login-url], [user:edit-url], [user:password], [user:one-time-login-url], [user:cancel-url].';
+  $email_token_help = t('Available variables are:') . ' [site:name], [site:url], [user:name], [user:mail], [site:login-url], [user:edit-url], [user:one-time-login-url], [user:cancel-url].';
 
   $form['email_admin_created'] = array(
     '#type' => 'fieldset',
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1101
diff -u -p -r1.1101 user.module
--- modules/user/user.module	10 Jan 2010 22:45:58 -0000	1.1101
+++ modules/user/user.module	11 Jan 2010 10:47:20 -0000
@@ -2194,10 +2194,9 @@ function _user_mail_text($key, $language
       case 'register_no_approval_required_body':
         $text = t("[user:name],
 
-Thank you for registering at [site:name]. You may now log in to [site:login-url] using the following username and password:
+Thank you for registering at [site:name]. You may now log in to [site:login-url] using the following username:
 
 username: [user:name]
-password: [user:password]
 
 You may also log in by clicking on this link or copying and pasting it in your browser:
 
@@ -2217,12 +2216,7 @@ After logging in, you will be redirected
       case 'register_admin_created_body':
         $text = t("[user:name],
 
-A site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password:
-
-username: [user:name]
-password: [user:password]
-
-You may also log in by clicking on this link or copying and pasting it in your browser:
+A site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] by clicking on this link or copying and pasting it in your browser:
 
 [user:one-time-login-url]
 
@@ -2230,6 +2224,10 @@ This is a one-time login, so it can be u
 
 After logging in, you will be redirected to [user:edit-url] so you can change your password.
 
+Once you have set your own password, you will be able to log in to [site:login-url] in the future using:
+
+username: [user:name]
+
 
 --  [site:name] team", array(), array('langcode' => $langcode));
         break;
@@ -2337,10 +2335,6 @@ function user_mail_tokens(&$replacements
   if (isset($data['user'])) {
     $replacements['[user:one-time-login-url]'] = user_pass_reset_url($data['user']);
     $replacements['[user:cancel-url]'] = user_cancel_url($data['user']);
-
-    if (isset($data['user']->password) && !empty($data['user']->password)) {
-      $replacements['[user:password]'] = $data['user']->password;
-    }
   }
 }