diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 99d297b0..ebf204b5 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -117,7 +117,7 @@
             {
                 await logger.LogInformation("Login Successful For Username {Username}", Username);
                 authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(ReturnUrl));
+                NavigationManager.NavigateTo(NavigateUrl(ReturnUrl, "reload"));
             }
             else
             {
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor
index 6acbe5be..90fb1e05 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor
@@ -85,7 +85,7 @@
     string name = "";
     string type = "LocalDB";
     string server = "(LocalDb)\\MSSQLLocalDB";
-    string database = "Oqtane-" + DateTime.Now.ToString("yyyyMMddHHmm");
+    string database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
     string username = "";
     string password = "";
     string schema = "";
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
index a5c3656f..f66ac87f 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -81,7 +81,7 @@
             notification.Subject = subject;
             notification.Body = body;
             notification.ParentId = null;
-            notification.CreatedOn = DateTime.Now;
+            notification.CreatedOn = DateTime.UtcNow;
             notification.IsDelivered = false;
             notification.DeliveredOn = null;
 
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 076e55e8..951ac04d 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -140,7 +140,7 @@
         notification.Subject = subject;
         notification.Body = body;
         notification.ParentId = notificationid;
-        notification.CreatedOn = DateTime.Now;
+        notification.CreatedOn = DateTime.UtcNow;
         notification.IsDelivered = false;
         notification.DeliveredOn = null;
 
diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
index 88e346f8..081469b7 100644
--- a/Oqtane.Client/Modules/Weather/Index.razor
+++ b/Oqtane.Client/Modules/Weather/Index.razor
@@ -37,6 +37,6 @@ else
     protected override async Task OnInitializedAsync()
     {
         WeatherForecastService forecastservice = new WeatherForecastService();
-        forecasts = await forecastservice.GetForecastAsync(DateTime.Now);
+        forecasts = await forecastservice.GetForecastAsync(DateTime.UtcNow);
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Services/Interfaces/IPageService.cs b/Oqtane.Client/Services/Interfaces/IPageService.cs
index 35ae6a2f..3a2ab862 100644
--- a/Oqtane.Client/Services/Interfaces/IPageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageService.cs
@@ -9,6 +9,7 @@ namespace Oqtane.Services
         Task<List<Page>> GetPagesAsync(int SiteId);
         Task<Page> GetPageAsync(int PageId);
         Task<Page> GetPageAsync(int PageId, int UserId);
+        Task<Page> GetPageAsync(string Path, int SiteId);
         Task<Page> AddPageAsync(Page Page);
         Task<Page> AddPageAsync(int PageId, int UserId);
         Task<Page> UpdatePageAsync(Page Page);
diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs
index a2952e4c..f2ddb714 100644
--- a/Oqtane.Client/Services/ModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/ModuleDefinitionService.cs
@@ -59,13 +59,13 @@ namespace Oqtane.Services
 
         public async Task LoadModuleDefinitionsAsync(int SiteId)
         {
+            // get list of modules from the server
+            List<ModuleDefinition> moduledefinitions = await GetModuleDefinitionsAsync(SiteId);
+
             // download assemblies to browser when running client-side Blazor
             var authstateprovider = (IdentityAuthenticationStateProvider)_serviceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
             if (authstateprovider != null)
             {
-                // get list of modules from the server
-                List<ModuleDefinition> moduledefinitions = await GetModuleDefinitionsAsync(SiteId);
-
                 // get list of loaded assemblies on the client ( in the client-side hosting module the browser client has its own app domain )
                 Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
 
diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs
index 9ad8cbbc..4b757600 100644
--- a/Oqtane.Client/Services/PageService.cs
+++ b/Oqtane.Client/Services/PageService.cs
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 using System;
+using System.Net;
 
 namespace Oqtane.Services
 {
@@ -44,6 +45,18 @@ namespace Oqtane.Services
             return await _http.GetJsonAsync<Page>(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString());
         }
 
+        public async Task<Page> GetPageAsync(string Path, int SiteId)
+        {
+            try
+            {
+                return await _http.GetJsonAsync<Page>(apiurl + "/path/" + SiteId.ToString() + "?path=" + WebUtility.UrlEncode(Path));
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         public async Task<Page> AddPageAsync(Page Page)
         {
             return await _http.PostJsonAsync<Page>(apiurl, Page);
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 4f4c7a77..f30d2435 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -76,7 +76,7 @@
 
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Module" class="control-label">Module: </label>
+                        <label for="Module" class="control-label">Module Management: </label>
                         <select class="form-control" @bind="@_moduleType">
                             <option value="new">Add New Module</option>
                             <option value="existing">Add Existing Module</option>
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index 522bd6e3..f8dbddd3 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -46,7 +46,7 @@
         {
             // client-side Blazor
             authstateprovider.NotifyAuthenticationChanged();
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path));
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
         }
     }
 }
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index cbaf3952..d36edf35 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -11,10 +11,10 @@
         </div>
     </div>
     <hr class="app-rule" />
-    <h2 class="text-center">Database Configuration</h2>
-    <div class="row">
-        <div class="mx-auto text-center">
-            <table class="form-group" cellpadding="4" cellspacing="4">
+    <div class="row justify-content-center">
+        <div class="col text-center">
+            <h2>Database Configuration</h2><br />
+            <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
                         <td>
@@ -73,12 +73,9 @@
                 </tbody>
             </table>
         </div>
-    </div>
-    <hr class="app-rule" />
-    <h2 class="text-center">Application Administrator</h2>
-    <div class="row">
-        <div class="mx-auto text-center">
-            <table class="form-group" cellpadding="4" cellspacing="4">
+        <div class="col text-center">
+            <h2>Application Administrator</h2><br />
+            <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
                         <td>
@@ -116,6 +113,7 @@
             </table>
         </div>
     </div>
+    <hr class="app-rule" />
     <div class="row">
         <div class="mx-auto text-center">
             <button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
@@ -128,7 +126,7 @@
 @code {
     private string DatabaseType = "LocalDB";
     private string ServerName = "(LocalDb)\\MSSQLLocalDB";
-    private string DatabaseName = "Oqtane-" + DateTime.Now.ToString("yyyyMMddHHmm");
+    private string DatabaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
     private string Username = "";
     private string Password = "";
     private string HostUsername = Constants.HostUser;
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index a21fbe39..e4221263 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -10,6 +10,7 @@
 @inject IUserService UserService
 @inject IModuleService ModuleService
 @inject IModuleDefinitionService ModuleDefinitionService
+@inject ILogService LogService
 @implements IHandleAfterRender
 
 @DynamicComponent
@@ -75,7 +76,6 @@
         int moduleid = -1;
         string action = "";
         bool editmode = false;
-        int userid = -1;
         Reload reload = Reload.None;
         DateTime lastsyncdate = DateTime.UtcNow;
 
@@ -94,23 +94,39 @@
             path = path.Substring(0, path.IndexOf("?"));
         }
 
+        // the reload parameter is used during user login/logout
+        if (querystring.ContainsKey("reload"))
+        {
+            reload = Reload.Site;
+        }
+
         if (PageState != null)
         {
             editmode = PageState.EditMode;
             lastsyncdate = PageState.LastSyncDate;
-            if (PageState.User != null)
-            {
-                userid = PageState.User.UserId;
-            }
         }
 
         alias = await AliasService.GetAliasAsync(_absoluteUri, lastsyncdate);
         SiteState.Alias = alias; // set state for services
         lastsyncdate = alias.SyncDate;
 
-        if (PageState == null || alias.SiteId != PageState.Alias.SiteId)
+        // process any sync events for site or page
+        if (reload != Reload.Site && alias.SyncEvents.Any())
+        {
+            if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == "Page" && item.EntityId == PageState.Page.PageId))
+            {
+                reload = Reload.Page;
+            }
+            if (alias.SyncEvents.Exists(item => item.EntityName == "Site" && item.EntityId == alias.SiteId))
+            {
+                reload = Reload.Site;
+            }
+        }
+
+        if (reload == Reload.Site || PageState == null || alias.SiteId != PageState.Alias.SiteId)
         {
             site = await SiteService.GetSiteAsync(alias.SiteId, alias);
+            reload = Reload.Site;
         }
         else
         {
@@ -118,29 +134,24 @@
         }
         if (site != null)
         {
-            // get user
-            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-            if (authState.User.Identity.IsAuthenticated)
+            if (PageState == null || reload == Reload.Site)
             {
-                user = await UserService.GetUserAsync(authState.User.Identity.Name, site.SiteId);
-                if (user != null)
+                // get user
+                var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+                if (authState.User.Identity.IsAuthenticated)
                 {
-                    userid = user.UserId;
+                    user = await UserService.GetUserAsync(authState.User.Identity.Name, site.SiteId);
                 }
             }
-
-            // process sync events
-            if (alias.SyncEvents.Any())
+            else
             {
-                if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == "Page" && item.EntityId == PageState.Page.PageId))
-                {
-                    reload = Reload.Page;
-                }
-                if (alias.SyncEvents.Exists(item => item.EntityName == "Site" && item.EntityId == alias.SiteId))
-                {
-                    reload = Reload.Site;
-                }
-                if (alias.SyncEvents.Exists(item => item.EntityName == "User" && item.EntityId == userid))
+                user = PageState.User;
+            }
+
+            // process any sync events for user
+            if (reload != Reload.Site && user != null && alias.SyncEvents.Any())
+            {
+                if (alias.SyncEvents.Exists(item => item.EntityName == "User" && item.EntityId == user.UserId))
                 {
                     reload = Reload.Site;
                 }
@@ -148,7 +159,7 @@
 
             if (PageState == null || reload >= Reload.Site)
             {
-                await ModuleDefinitionService.LoadModuleDefinitionsAsync(site.SiteId); 
+                await ModuleDefinitionService.LoadModuleDefinitionsAsync(site.SiteId);
                 pages = await PageService.GetPagesAsync(site.SiteId);
             }
             else
@@ -206,7 +217,7 @@
             {
                 page = pages.Where(item => item.Path == path).FirstOrDefault();
                 reload = Reload.Page;
-                if (page!=null)
+                if (page != null)
                 {
                     editmode = page.EditMode;
                 }
@@ -255,21 +266,23 @@
 
                     OnStateChange?.Invoke(pagestate);
                 }
-                else
-                {
-                    // user is not authorized to view page
-                    if (path != "")
-                    {
-                        NavigationManager.NavigateTo("");
-                    }
-                }
             }
             else
             {
-                // page does not exist
-                if (path != "")
+                if (user == null)
                 {
-                    NavigationManager.NavigateTo("");
+                    await LogService.Log(null, null, null, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", path);
+                    // redirect to login page
+                    NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "returnurl=" + path));
+                }
+                else
+                {
+                    await LogService.Log(null, null, user.UserId, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", path);
+                    if (path != "")
+                    {
+                        // redirect to home page
+                        NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "", ""));
+                    }
                 }
             }
         }
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index d1606eaa..0cd6925f 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -312,8 +312,8 @@ namespace Oqtane.Controllers
             fileparts = Directory.GetFiles(folder, "*" + token + "*");
             foreach (string filepart in fileparts)
             {
-                DateTime createddate = System.IO.File.GetCreationTime(filepart);
-                if (createddate < DateTime.Now.AddHours(-2))
+                DateTime createddate = System.IO.File.GetCreationTime(filepart).ToUniversalTime();
+                if (createddate < DateTime.UtcNow.AddHours(-2))
                 {
                     System.IO.File.Delete(filepart);
                 }
diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index 55ddceee..7f8b358f 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -224,7 +224,7 @@ namespace Oqtane.Controllers
                         {
                             version = new ApplicationVersion();
                             version.Version = Constants.Version;
-                            version.CreatedOn = DateTime.Now;
+                            version.CreatedOn = DateTime.UtcNow;
                             db.ApplicationVersion.Add(version);
                             db.SaveChanges();
                         }
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index 8d3bff3a..b797e4a1 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -7,6 +7,7 @@ using Oqtane.Shared;
 using System.Linq;
 using Oqtane.Infrastructure;
 using Oqtane.Security;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -70,6 +71,31 @@ namespace Oqtane.Controllers
             }
         }
 
+        // GET api/<controller>/path/x?path=y
+        [HttpGet("path/{siteid}")]
+        public Page Get(string path, int siteid)
+        {
+            Page page = _pages.GetPage(WebUtility.UrlDecode(path), siteid);
+            if (page != null)
+            {
+                if (_userPermissions.IsAuthorized(User, "View", page.Permissions))
+                {
+                    return page;
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
+                    HttpContext.Response.StatusCode = 401;
+                    return null;
+                }
+            }
+            else
+            {
+                HttpContext.Response.StatusCode = 404;
+                return null;
+            }
+        }
+        
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 1a8cdef2..5c24186e 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -111,7 +111,7 @@ namespace Oqtane.Controllers
                             string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
                             notification.Body = "Dear " + User.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
                             notification.ParentId = null;
-                            notification.CreatedOn = DateTime.Now;
+                            notification.CreatedOn = DateTime.UtcNow;
                             notification.IsDelivered = false;
                             notification.DeliveredOn = null;
                             _notifications.AddNotification(notification);
@@ -240,10 +240,9 @@ namespace Oqtane.Controllers
                             if (identityuser.EmailConfirmed)
                             {
                                 user.IsAuthenticated = true;
-                                user.LastLoginOn = DateTime.Now;
+                                user.LastLoginOn = DateTime.UtcNow;
                                 user.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
                                 _users.UpdateUser(user);
-                                _syncManager.AddSyncEvent("User", user.UserId);
                                 _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
                                 if (SetCookie)
                                 {
@@ -272,7 +271,6 @@ namespace Oqtane.Controllers
         public async Task Logout([FromBody] User User)
         {
             await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
-            _syncManager.AddSyncEvent("User", User.UserId);
             _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
         }
 
@@ -324,7 +322,7 @@ namespace Oqtane.Controllers
                     string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/reset?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
                     notification.Body = "Dear " + User.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
                     notification.ParentId = null;
-                    notification.CreatedOn = DateTime.Now;
+                    notification.CreatedOn = DateTime.UtcNow;
                     notification.IsDelivered = false;
                     notification.DeliveredOn = null;
                     _notifications.AddNotification(notification);
diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs
index 4817bcb5..28e3e7fa 100644
--- a/Oqtane.Server/Controllers/UserRoleController.cs
+++ b/Oqtane.Server/Controllers/UserRoleController.cs
@@ -12,11 +12,13 @@ namespace Oqtane.Controllers
     public class UserRoleController : Controller
     {
         private readonly IUserRoleRepository _userRoles;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public UserRoleController(IUserRoleRepository userRoles, ILogManager logger)
+        public UserRoleController(IUserRoleRepository userRoles, ISyncManager syncManager, ILogManager logger)
         {
             _userRoles = userRoles;
+            _syncManager = syncManager;
             _logger = logger;
         }
 
@@ -44,6 +46,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid)
             {
                 UserRole = _userRoles.AddUserRole(UserRole);
+                _syncManager.AddSyncEvent("User", UserRole.UserId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
             }
             return UserRole;
@@ -57,6 +60,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid)
             {
                 UserRole = _userRoles.UpdateUserRole(UserRole);
+                _syncManager.AddSyncEvent("User", UserRole.UserId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
             }
             return UserRole;
@@ -67,8 +71,10 @@ namespace Oqtane.Controllers
         [Authorize(Roles = Constants.AdminRole)]
         public void Delete(int id)
         {
+            UserRole userRole = _userRoles.GetUserRole(id);
             _userRoles.DeleteUserRole(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRoleId}", id);
+            _syncManager.AddSyncEvent("User", userRole.UserId);
+            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole);
         }
     }
 }
diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
index 2130a5cd..37421b87 100644
--- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
@@ -50,19 +50,19 @@ namespace Oqtane.Infrastructure
                                 }
                                 else
                                 {
-                                    Job.NextExecution = DateTime.Now;
+                                    Job.NextExecution = DateTime.UtcNow;
                                 }
                             }
 
                             // determine if the job should be run
-                            if (Job.NextExecution <= DateTime.Now && (Job.EndDate == null || Job.EndDate >= DateTime.Now))
+                            if (Job.NextExecution <= DateTime.UtcNow && (Job.EndDate == null || Job.EndDate >= DateTime.UtcNow))
                             {
                                 IJobLogRepository JobLogs = scope.ServiceProvider.GetRequiredService<IJobLogRepository>();
 
                                 // create a job log entry
                                 JobLog log = new JobLog();
                                 log.JobId = Job.JobId;
-                                log.StartDate = DateTime.Now;
+                                log.StartDate = DateTime.UtcNow;
                                 log.FinishDate = null;
                                 log.Succeeded = false;
                                 log.Notes = "";
@@ -85,7 +85,7 @@ namespace Oqtane.Infrastructure
                                 }
 
                                 // update the job log
-                                log.FinishDate = DateTime.Now;
+                                log.FinishDate = DateTime.UtcNow;
                                 JobLogs.UpdateJobLog(log);
 
                                 // update the job
@@ -132,9 +132,9 @@ namespace Oqtane.Infrastructure
                     NextExecution = NextExecution.AddMonths(Interval);
                     break;
             }
-            if (NextExecution < DateTime.Now)
+            if (NextExecution < DateTime.UtcNow)
             {
-                NextExecution = DateTime.Now;
+                NextExecution = DateTime.UtcNow;
             }
             return NextExecution;
         }
diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
index f1914990..e693924d 100644
--- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
@@ -95,7 +95,7 @@ namespace Oqtane.Infrastructure
                                 client.Send(mailMessage);
                                 sent = sent++;
                                 notification.IsDelivered = true;
-                                notification.DeliveredOn = DateTime.Now;
+                                notification.DeliveredOn = DateTime.UtcNow;
                                 Notifications.UpdateNotification(notification);
                             }
                             catch (Exception ex)
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index 9ba8939f..e120ff7d 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -30,7 +30,7 @@ namespace Oqtane.Repository
             {
                 username = _accessor.HttpContext.User.Identity.Name;
             }
-            DateTime date = DateTime.Now;
+            DateTime date = DateTime.UtcNow;
 
             var created = ChangeTracker.Entries()
                 .Where(x => x.State == EntityState.Added);
diff --git a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
index ee66b050..9f98c5ac 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
@@ -10,6 +10,7 @@ namespace Oqtane.Repository
         Page UpdatePage(Page Page);
         Page GetPage(int PageId);
         Page GetPage(int PageId, int UserId);
+        Page GetPage(string Path, int SiteId);
         void DeletePage(int PageId);
     }
 }
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 0c4071a2..b7dd8f03 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -53,39 +53,43 @@ namespace Oqtane.Repository
         {
             List<ModuleDefinition> ModuleDefinitions;
 
+            // get run-time module definitions 
             ModuleDefinitions = _cache.GetOrCreate("moduledefinitions", entry =>
             {
                 entry.SlidingExpiration = TimeSpan.FromMinutes(30);
                 return LoadModuleDefinitionsFromAssemblies();
             });
 
-            // sync module definitions with database
-            List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
+            // get module defintion permissions for site
             List<Permission> permissions = _permissions.GetPermissions(SiteId, "ModuleDefinition").ToList();
+
+            // get module definitions in database
+            List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
+
+            // sync run-time module definitions with database
             foreach (ModuleDefinition moduledefinition in ModuleDefinitions)
             {
                 ModuleDefinition moduledef = moduledefs.Where(item => item.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).FirstOrDefault();
                 if (moduledef == null)
                 {
+                    // new module definition
                     moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName };
                     _db.ModuleDefinition.Add(moduledef);
                     _db.SaveChanges();
-                    if (moduledefinition.Permissions != "")
-                    {
-                        _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
-                        foreach(Permission permission in _permissions.GetPermissions("ModuleDefinition", moduledef.ModuleDefinitionId))
-                        {
-                            permissions.Add(permission);
-                        }
-                    }
+                    _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
                 }
                 else
                 {
-                    moduledefs.Remove(moduledef); // remove module definition from list 
+                    // existing module definition
+                    if (permissions.Count == 0)
+                    {
+                        _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                    }
+                    // remove module definition from list
+                    moduledefs.Remove(moduledef);  
                 }
                 moduledefinition.ModuleDefinitionId = moduledef.ModuleDefinitionId;
                 moduledefinition.SiteId = SiteId;
-                moduledefinition.Permissions = _permissions.EncodePermissions(moduledefinition.ModuleDefinitionId, permissions);
                 moduledefinition.CreatedBy = moduledef.CreatedBy;
                 moduledefinition.CreatedOn = moduledef.CreatedOn;
                 moduledefinition.ModifiedBy = moduledef.ModifiedBy;
diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs
index 4ef0ec09..a016a88c 100644
--- a/Oqtane.Server/Repository/PageRepository.cs
+++ b/Oqtane.Server/Repository/PageRepository.cs
@@ -75,6 +75,17 @@ namespace Oqtane.Repository
             return page;
         }
 
+        public Page GetPage(string Path, int SiteId)
+        {
+            Page page = _db.Page.Where(item => item.Path == Path && item.SiteId == SiteId).FirstOrDefault();
+            if (page != null)
+            {
+                IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
+                page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
+            }
+            return page;
+        }
+
         public void DeletePage(int PageId)
         {
             Page Page = _db.Page.Find(PageId);