diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index 70dcc2a..d9811e8 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -61,9 +61,9 @@ function user_pass($form, &$form_state) { $accounts = $form_state['storage']['accounts']; $options = array(); foreach ($accounts as $account) { - $label = t('Account name: @name', array('@name' => $account->name)); + $label = t('The account with the username: @name', array('@name' => $account->name)); if ($account->mail == $form_state['storage']['name']) { - $label .= '/ ' . t('Email address: @email', array('@email' => $account->mail)); + $label = t('The account with the email address: @email', array('@email' => $account->mail)); } $options[$account->uid] = $label; } diff --git a/core/modules/user/user.test b/core/modules/user/user.test index c76b3cb..a70aa09 100644 --- a/core/modules/user/user.test +++ b/core/modules/user/user.test @@ -516,7 +516,7 @@ class UserPasswordResetTestCase extends WebTestBase { // Make sure the user with the matching username was sent an email. $this->assertText(t('Further instructions have been sent to your e-mail address.'), 'User is notified that password reset was sent when logged in.'); $this->assertEqual(count($this->drupalGetMails(array('key' => 'password_reset', 'to' => $user_with_name->mail))), 1, 'The right user was sent a password reset mail when logged in.'); - // Make sure that the user with the matching email address was not sent an + // Make sure that the user with the matching email address was not sent an // email. (An email was already sent to this user earlier.) $this->assertEqual(count($this->drupalGetMails(array('key' => 'password_reset', 'to' => $user_with_email->mail))), 1, 'The other user was not sent a password reset mail when logged in.');