Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.96
diff -u -p -r1.96 user.admin.inc
--- modules/user/user.admin.inc	14 Jan 2010 04:04:30 -0000	1.96
+++ modules/user/user.admin.inc	14 Jan 2010 10:38:55 -0000
@@ -423,7 +423,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.1109
diff -u -p -r1.1109 user.module
--- modules/user/user.module	14 Jan 2010 04:08:31 -0000	1.1109
+++ modules/user/user.module	14 Jan 2010 10:38:55 -0000
@@ -2206,19 +2206,18 @@ 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:
-
-username: [user:name]
-password: [user:password]
-
-You may also log in by clicking on this link or copying and pasting it in your browser:
+Thank you for registering at [site:name]. You may now log in by clicking on this link or copying and pasting it in your browser:
 
 [user:one-time-login-url]
 
 This is a one-time login, so it can be used only once.
 
-After logging in, you will be redirected to [user:edit-url] so you can change your password.
+After logging in, you will be redirected to [user:edit-url] so you can set 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]
+password: Your own password
 
 --  [site:name] team", array(), array('langcode' => $langcode));
         break;
@@ -2229,19 +2228,18 @@ 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]
 
 This is a one-time login, so it can be used only once.
 
-After logging in, you will be redirected to [user:edit-url] so you can change your password.
+After logging in, you will be redirected to [user:edit-url] so you can set 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]
+password: Your own password
 
 --  [site:name] team", array(), array('langcode' => $langcode));
         break;
@@ -2272,13 +2270,13 @@ Thank you for registering at [site:name]
 
 A request to reset the password for your account has been made at [site:name].
 
-You may now log in to [site:uri-brief] by clicking on this link or copying and pasting it in your browser:
+You may now log in to [site:url-brief] by clicking on this link or copying and pasting it in your browser:
 
 [user:one-time-login-url]
 
 This is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.
 
-After logging in, you will be redirected to [user:edit-url] so you can change your password.", array(), array('langcode' => $langcode));
+After logging in, you will be redirected to [user:edit-url] so you can reset your password.", array(), array('langcode' => $langcode));
         break;
 
       case 'status_activated_subject':
@@ -2295,11 +2293,14 @@ You may now log in by clicking on this l
 
 This is a one-time login, so it can be used only once.
 
-After logging in, you will be redirected to [user:edit-url] so you can change your password.
+After logging in, you will be redirected to [user:edit-url] so you can set 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]", array(), array('langcode' => $langcode));
+username: [user:name]
+password: Your own password
+
+--  [site:name] team", array(), array('langcode' => $langcode));
         break;
 
       case 'status_blocked_subject':
@@ -2349,10 +2350,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;
-    }
   }
 }
 
@@ -3221,10 +3218,10 @@ function user_register_submit($form, &$f
     $op = $notify ? 'register_admin_created' : 'register_no_approval_required';
     _user_mail_notify($op, $account);
     if ($notify) {
-      drupal_set_message(t('Password and further instructions have been e-mailed to the new user <a href="@url">%name</a>.', array('@url' => url("user/$account->uid"), '%name' => $account->name)));
+      drupal_set_message(t('A welcome message with further instructions has been e-mailed to the new user <a href="@url">%name</a>.', array('@url' => url("user/$account->uid"), '%name' => $account->name)));
     }
     else {
-      drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
+      drupal_set_message(t('A welcome message with further instructions has been sent to your e-mail address.'));
       $form_state['redirect'] = '';
     }
   }
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.76
diff -u -p -r1.76 user.test
--- modules/user/user.test	10 Jan 2010 22:45:58 -0000	1.76
+++ modules/user/user.test	14 Jan 2010 10:38:56 -0000
@@ -25,7 +25,7 @@ class UserRegistrationTestCase extends D
     $edit['name'] = $name = $this->randomName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $this->drupalPost('user/register', $edit, t('Create new account'));
-    $this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), t('User registered successfully.'));
+    $this->assertText(t('A welcome message with further instructions has been sent to your e-mail address.'), t('User registered successfully.'));
     $accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
     $new_user = reset($accounts);
     $this->assertTrue($new_user->status, t('New account is active after registration.'));