diff --git a/core/includes/form.inc b/core/includes/form.inc
index 1610f80..0a1841a 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -1166,14 +1166,14 @@ function template_preprocess_radios(&$variables) {
function form_process_password_confirm($element) {
$element['pass1'] = array(
'#type' => 'password',
- '#title' => t('Password'),
+ '#title' => !empty($element['#title1']) ? $element['#title1'] : t('Password'),
'#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'],
'#required' => $element['#required'],
'#attributes' => array('class' => array('password-field')),
);
$element['pass2'] = array(
'#type' => 'password',
- '#title' => t('Confirm password'),
+ '#title' => !empty($element['#title2']) ? $element['#title2'] : t('Confirm password'),
'#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'],
'#required' => $element['#required'],
'#attributes' => array('class' => array('password-confirm')),
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index f4f718b..60d0e78 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -115,6 +115,9 @@ public function form(array $form, array &$form_state) {
if (!$register) {
$form['account']['pass'] = array(
'#type' => 'password_confirm',
+ '#prefix' => '
' . $this->t('Change password') . '
',
+ '#title1' => $this->t('New password'),
+ '#title2' => $this->t('Confirm new password'),
'#size' => 25,
'#description' => $this->t('To change the current user password, enter the new password in both fields.'),
);
@@ -130,9 +133,9 @@ public function form(array $form, array &$form_state) {
// password if they logged in via a one-time login link.
if (!$pass_reset) {
$protected_values['mail'] = $form['account']['mail']['#title'];
- $protected_values['pass'] = $this->t('Password');
+ $protected_values['pass'] = $this->t('New password');
$request_new = l($this->t('Request new password'), 'user/password', array('attributes' => array('title' => $this->t('Request new password via email.'))));
- $current_pass_description = $this->t('Required if you want to change the %mail or %pass below. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
+ $current_pass_description = $this->t('Required if you want to change the %mail or %pass above. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
}
// The user must enter their current password to change to a new one.
@@ -148,11 +151,17 @@ public function form(array $form, array &$form_state) {
'#size' => 25,
'#access' => !empty($protected_values),
'#description' => $current_pass_description,
- '#weight' => -5,
// Do not let web browsers remember this password, since we are
// trying to confirm that the person submitting the form actually
// knows the current one.
'#attributes' => array('autocomplete' => 'off'),
+ '#states' => array(
+ // Only show this field when mail or new password has changed.
+ 'visible' => array(
+ array(':input[name="mail"]' => array('!value' => $account->getEmail())),
+ array(':input[name="pass[pass1]"]' => array('filled' => TRUE)),
+ ),
+ ),
);
$form_state['user'] = $account;