diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs
index 14b28c2a..ef7b32d6 100644
--- a/Oqtane.Server/Services/SiteService.cs
+++ b/Oqtane.Server/Services/SiteService.cs
@@ -104,6 +104,12 @@ namespace Oqtane.Services
             }
             site.Languages = site.Languages.OrderBy(item => item.Name).ToList();
 
+            // get user
+            if (_accessor.HttpContext.User.IsAuthenticated())
+            {
+                site.User = _userManager.GetUser(_accessor.HttpContext.User.UserId(), site.SiteId);
+            }
+
             return Task.FromResult(site);
         }
 
@@ -149,12 +155,6 @@ namespace Oqtane.Services
                 // themes
                 site.Themes = _themes.FilterThemes(_themes.GetThemes(site.SiteId).ToList());
 
-                // user
-                if (_accessor.HttpContext.User.IsAuthenticated())
-                {
-                    site.User = _userManager.GetUser(_accessor.HttpContext.User.UserId(), site.SiteId);
-                }
-
                 // installation date used for fingerprinting static assets
                 site.Fingerprint = Utilities.GenerateSimpleHash(_configManager.GetSetting("InstallationDate", DateTime.UtcNow.ToString("yyyyMMddHHmm")));