diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
index 47bbbce640e36..7d6e79d39bc0a 100644
--- a/core/Controller/ClientFlowLoginController.php
+++ b/core/Controller/ClientFlowLoginController.php
@@ -319,6 +319,9 @@ public function generateAppPassword($stateToken,
 			$redirectUri = 'nc://login/server:' . $serverPath . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
 		}
 
+		// Clear the token from the login here
+		$this->tokenProvider->invalidateToken($sessionId);
+
 		return new Http\RedirectResponse($redirectUri);
 	}
 }