diff --git a/apps/files_external/lib/Listener/StorePasswordListener.php b/apps/files_external/lib/Listener/StorePasswordListener.php
index 3212f2a48c..f1683af2ec 100644
--- a/apps/files_external/lib/Listener/StorePasswordListener.php
+++ b/apps/files_external/lib/Listener/StorePasswordListener.php
@@ -52,9 +52,10 @@ class StorePasswordListener implements IEventListener {
 
 		$stored = $this->credentialsManager->retrieve($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);
 
-		if ($stored && $stored['password'] !== $event->getPassword()) {
+		if ($stored && ($stored['user'] !== $event->getUser()->getUID()
+				|| $stored['password'] !== $event->getPassword())) {
 			$credentials = [
-				'user' => $stored['user'],
+				'user' => $event->getUser()->getUID(),
 				'password' => $event->getPassword()
 			];