diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 373ddb5c6..0abd233cd 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -691,6 +691,8 @@ const LoginDialog = new Lang.Class({
     },
 
     _reset: function() {
+        this._userVerifier.clear();
+
         this._updateSensitivity(true);
         this._promptMessage.hide();
         this._user = null;
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 6b69f33ee..4de22e416 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -346,8 +346,6 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        this.clear();
-
         // Clear previous attempts to authenticate
         this._failCounter = 0;
 
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 29825323e..70452a8de 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -255,6 +255,7 @@ const UnlockDialog = new Lang.Class({
     },
 
     _onReset: function() {
+        this._userVerifier.clear();
         this.emit('failed');
     },