diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index 4d39a638..ffe021d9 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -80,11 +80,14 @@
                                 }
                                 else
                                 {
-                                    foreach (Page p in _pages)
+                                    if (_pages != null)
                                     {
-                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, p.PermissionList))
+                                        foreach (Page p in _pages)
                                         {
-                                            <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, p.PermissionList))
+                                            {
+                                                <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                            }
                                         }
                                     }
                                 }
diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs
index 8b173552..d5508858 100644
--- a/Oqtane.Shared/Models/Site.cs
+++ b/Oqtane.Shared/Models/Site.cs
@@ -220,6 +220,10 @@ namespace Oqtane.Models
                 ImageFiles = site.ImageFiles,
                 UploadableFiles = site.UploadableFiles,
                 SiteTemplateType = site.SiteTemplateType,
+                CreatedBy = site.CreatedBy,
+                CreatedOn = site.CreatedOn,
+                ModifiedBy = site.ModifiedBy,
+                ModifiedOn = site.ModifiedOn,
                 Settings = site.Settings.ToDictionary(),
                 Pages = site.Pages.ToList(),
                 Languages = site.Languages.ToList(),