diff --git a/src/uxbox/data/auth.cljs b/src/uxbox/data/auth.cljs
index f9269d9aa..9b70b6437 100644
--- a/src/uxbox/data/auth.cljs
+++ b/src/uxbox/data/auth.cljs
@@ -45,6 +45,10 @@
 ;; --- Login
 
 (defrecord Login [username password]
+  rs/UpdateEvent
+  (-apply-update [_ state]
+    (merge state (dissoc (st/get-initial-state) :route)))
+
   rs/WatchEvent
   (-apply-watch [this state s]
     (letfn [(on-error [err]
@@ -74,7 +78,7 @@
 (defrecord Logout []
   rs/UpdateEvent
   (-apply-update [_ state]
-    (st/get-initial-state))
+    (merge state (dissoc (st/get-initial-state) :route)))
 
   rs/WatchEvent
   (-apply-watch [_ state s]