diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index f084ea5ca0..4a20f3e9c1 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -326,6 +326,7 @@ class LostController extends Controller {
 			$this->twoFactorManager->clearTwoFactorPending($userId);
 
 			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
+			$this->config->deleteUserValue($userId, 'core', 'initial');
 			@\OC::$server->getUserSession()->unsetMagicInCookie();
 		} catch (HintException $e){
 			return $this->error($e->getHint());