diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 1c09c29eb..d2b93ba72 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -894,7 +894,10 @@ const LoginDialog = new Lang.Class({
     },
 
     cancel: function() {
-        this._userVerifier.cancel();
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
     },
 
     _fadeInPrompt: function() {