diff --git a/src/cljs/auto_ap/events.cljs b/src/cljs/auto_ap/events.cljs
index 92fc9162..d33fc69e 100644
--- a/src/cljs/auto_ap/events.cljs
+++ b/src/cljs/auto_ap/events.cljs
@@ -142,12 +142,17 @@
 (re-frame/reg-event-fx
  ::set-active-route
  (fn  [{:keys [db]} [_ handler params route-params]]
+   (println "HANDELR IS" handler (:user db))
+
    
 
-   (if (and (not= :login handler) (not (:user db)))
-     {:redirect "/login"
-      :db (assoc db :active-route :login
-                 :page-failure nil)}
+   (cond 
+     (and (not= :login handler) (not (:user db)))
+     {:redirect (bidi/path-for routes/routes :login)
+      :db       (assoc db :active-route :login
+                       :active-page :login
+                       :page-failure nil)}
+     :else
      {:db (-> db
               (assoc :active-route handler
                      :page-failure nil
diff --git a/src/cljs/auto_ap/views/main.cljs b/src/cljs/auto_ap/views/main.cljs
index f924ea3f..a31762ff 100644
--- a/src/cljs/auto_ap/views/main.cljs
+++ b/src/cljs/auto_ap/views/main.cljs
@@ -144,8 +144,9 @@
   (let [ap (re-frame/subscribe [::subs/active-page])
         current-client @(re-frame/subscribe [::subs/client])
         is-loading? @(re-frame/subscribe [::subs/is-initial-loading?])]
-    (if is-loading? 
-      [loading-layout]
-      
-      [:div
-       ^{:key (str @ap "-" current-client)} [page @ap]])))
+    (when @ap
+      (if is-loading? 
+        [loading-layout]
+        
+        [:div
+         ^{:key (str @ap "-" current-client)} [page @ap]]))))