diff --git a/modules/webapp/src/main/elm/App/Data.elm b/modules/webapp/src/main/elm/App/Data.elm
index e977743a..9102ddaa 100644
--- a/modules/webapp/src/main/elm/App/Data.elm
+++ b/modules/webapp/src/main/elm/App/Data.elm
@@ -1,7 +1,6 @@
 module App.Data exposing
     ( Model
     , Msg(..)
-    , checkPage
     , defaultPage
     , init
     )
@@ -148,29 +147,6 @@ type Msg
     | GetUiSettings UiSettings
 
 
-isSignedIn : Flags -> Bool
-isSignedIn flags =
-    flags.account
-        |> Maybe.map .success
-        |> Maybe.withDefault False
-
-
-checkPage : Flags -> Page -> Page
-checkPage flags page =
-    if Page.isSecured page && isSignedIn flags then
-        page
-
-    else if Page.isOpen page then
-        page
-
-    else
-        Page.loginPage page
-
-
 defaultPage : Flags -> Page
 defaultPage flags =
-    if isSignedIn flags then
-        HomePage
-
-    else
-        LoginPage Nothing
+    HomePage
diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm
index d6962dfa..604a24fb 100644
--- a/modules/webapp/src/main/elm/App/Update.elm
+++ b/modules/webapp/src/main/elm/App/Update.elm
@@ -178,18 +178,8 @@ updateWithSub msg model =
                 page =
                     Page.fromUrl url
                         |> Maybe.withDefault (defaultPage model.flags)
-
-                check =
-                    checkPage model.flags page
-
-                ( m, c, s ) =
-                    initPage model page
             in
-            if check == page then
-                ( { m | page = page }, c, s )
-
-            else
-                ( model, Page.goto check, Sub.none )
+            ( model, Page.goto page, Sub.none )
 
         ToggleNavMenu ->
             ( { model
diff --git a/modules/webapp/src/main/elm/Main.elm b/modules/webapp/src/main/elm/Main.elm
index c2cf7521..6523dfe5 100644
--- a/modules/webapp/src/main/elm/Main.elm
+++ b/modules/webapp/src/main/elm/Main.elm
@@ -42,22 +42,15 @@ init flags url key =
         ( im, ic ) =
             App.Data.init key url flags Data.UiSettings.defaults
 
-        page =
-            checkPage flags im.page
-
         ( m, cmd, s ) =
-            if im.page == page then
-                App.Update.initPage im page
-
-            else
-                ( im, Page.goto page, Sub.none )
+            App.Update.initPage im im.page
     in
     ( { m | subs = s }
     , Cmd.batch
         [ cmd
         , ic
         , Api.versionInfo flags VersionResp
-        , if Page.isSecured page then
+        , if Page.isSecured im.page then
             Api.loginSession flags SessionCheckResp
 
           else