diff --git a/src/module/gtkwindow.py b/src/module/gtkwindow.py
index cd59ab7..0e2833d 100644
--- a/src/module/gtkwindow.py
+++ b/src/module/gtkwindow.py
@@ -182,6 +182,7 @@ def login_handler(self):
             os.unlink("/{}/pardus-greeter".format(busdir))
 
         self.kill_windowmanager()
+        self.o("ui_window_main").hide()
 
 
 ############### events ###############
diff --git a/src/module/lightdm.py b/src/module/lightdm.py
index 3ec3a54..721daf3 100644
--- a/src/module/lightdm.py
+++ b/src/module/lightdm.py
@@ -179,6 +179,8 @@ def __authentication_complete(self, greeter):
             except:
                 # Exit greeter (for reload)
                 sys.exit(0)
+            debug("Greeter done")
+            sys.exit(0)
         else:
             # Authentication failed.
             self.__show_message(greeter, _(