diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index ff04af639..5b6966eb5 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -157,8 +157,9 @@ var AuthPrompt = GObject.registerClass({
             });
 
             entry.clutter_text.connect('activate', () => {
+                let shouldSpin = entry === this._passwordEntry;
                 if (entry.reactive)
-                    this._activateNext();
+                    this._activateNext(shouldSpin);
             });
         });
 
@@ -177,9 +178,12 @@ var AuthPrompt = GObject.registerClass({
         this._defaultButtonWell.add_child(this._spinner);
     }
 
-    _activateNext() {
+    _activateNext(shouldSpin) {
         this.updateSensitivity(false);
-        this.startSpinning();
+
+        if (shouldSpin)
+            this.startSpinning();
+
         if (this._queryingService)
             this._userVerifier.answerQuery(this._queryingService, this._entry.text);
         else
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 2505d1894..cad09b548 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -928,7 +928,6 @@ var LoginDialog = GObject.registerClass({
                 let answer = this._authPrompt.getAnswer();
                 this._user = this._userManager.get_user(answer);
                 this._authPrompt.clear();
-                this._authPrompt.startSpinning();
                 this._authPrompt.begin({ userName: answer });
                 this._updateCancelButton();
             });