diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 9a76cb88..f8766bab 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -50,7 +50,7 @@
         if (user != null)
         {
             AuthStateProvider.NotifyAuthenticationChanged();
-            UriHelper.NavigateTo(NavigateUrl(""));
+            UriHelper.NavigateTo(NavigateUrl("", true));
         }
         else
         {
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index fd30c9d8..b2cf5ab4 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -107,20 +107,6 @@ private async Task Refresh()
     }
     if (site != null || reload == true)
     {
-        user = null;
-        if (PageState == null || reload == true)
-        {
-            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            if (authState.User.Identity.IsAuthenticated)
-            {
-                user = await UserService.GetCurrentUserAsync();
-            }
-        }
-        else
-        {
-            user = PageState.User;
-        }
-
         string path = new Uri(_absoluteUri).PathAndQuery.Substring(1);
         if (path.EndsWith("/")) { path = path.Substring(0, path.Length - 1); }
         if (alias.Path != "")
@@ -135,6 +121,20 @@ private async Task Refresh()
             reload = true;
         }
 
+        user = null;
+        if (PageState == null || reload == true)
+        {
+            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            if (authState.User.Identity.IsAuthenticated)
+            {
+                user = await UserService.GetCurrentUserAsync();
+            }
+        }
+        else
+        {
+            user = PageState.User;
+        }
+
         if (PageState == null || reload == true)
         {
             pages = await PageService.GetPagesAsync(site.SiteId);
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index 92e006d1..898f9c0b 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -29,6 +29,6 @@
     {
         await UserService.LogoutUserAsync();
         AuthStateProvider.NotifyAuthenticationChanged();
-        UriHelper.NavigateTo(NavigateUrl(""));
+        UriHelper.NavigateTo(NavigateUrl("", true));
     }
 }