diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 1ecd890..fa5c3fe 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -98,6 +98,7 @@ abstract class AccountFormController extends EntityFormController {
           '#attributes' => array('autocomplete' => 'off'),
         );
 
+        $form_state['user'] = $account;
         $form['#validate'][] = 'user_validate_current_pass';
       }
     }
diff --git a/core/modules/user/tests/user_form_test.module b/core/modules/user/tests/user_form_test.module
index b65a1c8..5702c53 100644
--- a/core/modules/user/tests/user_form_test.module
+++ b/core/modules/user/tests/user_form_test.module
@@ -27,6 +27,7 @@ function user_form_test_menu() {
  */
 function user_form_test_current_password($form, &$form_state, $account) {
   $account->user_form_test_field = '';
+  $form_state['user'] = $account;
 
   $form['user_form_test_field'] = array(
     '#type' => 'textfield',
@@ -34,7 +35,7 @@ function user_form_test_current_password($form, &$form_state, $account) {
     '#description' => t('A field that would require a correct password to change.'),
     '#required' => TRUE,
   );
-  
+
   $form['current_pass'] = array(
     '#type' => 'password',
     '#title' => t('Current password'),
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index b53a71f..d755d1c 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -722,7 +722,7 @@ function _user_language_selector_langcode_value($element, $input, &$form_state)
  * @see AccountFormController::form()
  */
 function user_validate_current_pass(&$form, &$form_state) {
-  $account = EntityFormController::getFormInstance($form_state)->getEntity();
+  $account = $form_state['user'];
   foreach ($form_state['values']['current_pass_required_values'] as $key => $name) {
     // This validation only works for required textfields (like mail) or
     // form values like password_confirm that have their own validation