From be0f9bcacec24c78955d5773886ab942722f1c20 Mon Sep 17 00:00:00 2001
From: "andrea.gaspardo@webformat.com" <andrea.gaspardo@webformat.com>
Date: Sat, 26 May 2018 14:59:59 +0200
Subject: [PATCH] magento/magento2#15255 unlock customer after password reset

---
 app/code/Magento/Customer/Model/AccountManagement.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 1b309635e329d..931d58bec2b18 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -586,6 +586,7 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $this->getAuthentication()->unlock($customer->getId());
         $this->sessionManager->destroy();
         $this->destroyCustomerSessions($customer->getId());
         $this->customerRepository->save($customer);