diff --git a/effects/login/login.cpp b/effects/login/login.cpp
index 84a0c3550a..3bde11e4a7 100644
--- a/effects/login/login.cpp
+++ b/effects/login/login.cpp
@@ -76,20 +76,13 @@ void LoginEffect::postPaintScreen()
     effects->postPaintScreen();
     }
 
-void LoginEffect::windowAdded( EffectWindow* w )
+void LoginEffect::windowClosed( EffectWindow* w )
     {
     if( isLoginSplash( w ))
         {
+        if( login_window )
+            return; // We already have a window... should never happen.
         login_window = w;
-        progress = 1.0;
-        effects->addRepaintFull();
-        }
-    }
-
-void LoginEffect::windowClosed( EffectWindow* w )
-    {
-    if( w == login_window )
-        {
         login_window->refWindow();
         progress = 0.0;
         effects->addRepaintFull();
diff --git a/effects/login/login.h b/effects/login/login.h
index 2a35b3fff6..42b59c1482 100644
--- a/effects/login/login.h
+++ b/effects/login/login.h
@@ -36,7 +36,6 @@ class LoginEffect
         virtual void postPaintScreen();
         virtual void prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time );
         virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
-        virtual void windowAdded( EffectWindow* w );
         virtual void windowClosed( EffectWindow* w );
     private:
         bool isLoginSplash( EffectWindow* w );