diff --git a/js/gdm/util.js b/js/gdm/util.js
index a4254f890..20ae4ca18 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -660,7 +660,14 @@ export class ShellUserVerifier extends Signals.EventEmitter {
         this.emit('reset');
     }
 
-    _onVerificationComplete() {
+    _onVerificationComplete(_client, serviceName) {
+        const isCredentialManager = !!this._credentialManagers[serviceName];
+        const isForeground = this.serviceIsForeground(serviceName);
+        if (isCredentialManager && isForeground) {
+            this._credentialManagers[serviceName].token = null;
+            this._preemptingService = null;
+        }
+
         this.emit('verification-complete');
     }