diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 8f2f0c5..9948ec8 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -225,7 +225,7 @@ public function form(array $form, array &$form_state, EntityInterface $account)
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::submit().
+   * Overrides Drupal\Core\Entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
     parent::validate($form, $form_state);
@@ -289,4 +289,16 @@ public function validate(array $form, array &$form_state) {
       }
     }
   }
+
+  /**
+   * Overrides Drupal\Core\Entity\EntityFormController::submit().
+   */
+  public function submit(array $form, array &$form_state) {
+    if (isset($form_state['user']) && !empty($form_state['values']['pass'])) {
+      // Remove the password reset tag since a new password was saved.
+      unset($_SESSION['pass_reset_'. $form_state['user']->id()]);
+    }
+
+    parent::submit($form, $form_state);
+  }
 }