diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 75a5a5b21..cb2a69ef8 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -917,9 +917,6 @@ var LoginDialog = GObject.registerClass({
     }
 
     _loginScreenSessionActivated() {
-        if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-            return;
-
         Tweener.addTween(this,
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
@@ -934,12 +931,18 @@ var LoginDialog = GObject.registerClass({
                            },
                            onUpdateScope: this,
                            onComplete() {
-                               if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                                   this._authPrompt.reset();
+                               this._authPrompt.reset();
                            },
                            onCompleteScope: this });
     }
 
+    _loginScreenSessionDeactivated() {
+        if (this._greeter) {
+            this._greeter.run_dispose();
+            this._greeter = null;
+        }
+    }
+
     _gotGreeterSessionProxy(proxy) {
         this._greeterSessionProxy = proxy;
         this._greeterSessionProxyChangedId =
@@ -949,6 +952,8 @@ var LoginDialog = GObject.registerClass({
 
                 if (proxy.Active)
                     this._loginScreenSessionActivated();
+                else
+                    this._loginScreenSessionDeactivated();
             });
     }