diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index f28731dc..61728e5f 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -99,32 +99,36 @@
 </TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
-    private string _installationid = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = string.Empty;
+	private string _serverpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _installationid = string.Empty;
 
-    private string _detailederrors = string.Empty;
-    private string _logginglevel = string.Empty;
-    private string _swagger = string.Empty;
-    private string _packageservice = string.Empty;
+	private string _detailederrors = string.Empty;
+	private string _logginglevel = string.Empty;
+	private string _swagger = string.Empty;
+	private string _packageservice = string.Empty;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _version = Constants.Version;
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
-        {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
-            _installationid = systeminfo["installationid"];
+		Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+		if (systeminfo != null)
+		{
+			_clrversion = systeminfo["clrversion"];
+			_osversion = systeminfo["osversion"];
+			_serverpath = systeminfo["serverpath"];
+			_servertime = systeminfo["servertime"];
+			if (DateTime.TryParse(_servertime, out DateTime date))
+			{
+				_servertime += " (" + date.ToUniversalTime().ToString() + " UTC)";
+			}
+			_installationid = systeminfo["installationid"];
 
             _detailederrors = systeminfo["detailederrors"];
             _logginglevel = systeminfo["logginglevel"];
diff --git a/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
index 695f12c8..f931ae8b 100644
--- a/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
@@ -42,22 +42,25 @@ namespace Oqtane.Infrastructure
                 Dictionary<string, string> settings = GetSettings(settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList());
 
                 // purge event log
-                int logretention = 30;
-                if (settings.ContainsKey("LogRetention") && settings["LogRetention"] != "")
+                int retention = 30; // 30 days
+                if (settings.ContainsKey("LogRetention") && !string.IsNullOrEmpty(settings["LogRetention"]))
                 {
-                    logretention = int.Parse(settings["LogRetention"]);
+                    retention = int.Parse(settings["LogRetention"]);
                 }
-                int count = logRepository.DeleteLogs(logretention);
-                log += count.ToString() + " Event Logs Purged<br />";
+                int count = logRepository.DeleteLogs(retention);
+                log += count.ToString() + " Events Purged<br />";
 
                 // purge visitors
-                int visitorrention = 30;
-                if (settings.ContainsKey("VisitorRetention") && settings["VisitorRetention"] != "")
+                if (site.VisitorTracking)
                 {
-                    visitorrention = int.Parse(settings["VisitorRetention"]);
+                    retention = 30; // 30 days
+                    if (settings.ContainsKey("VisitorRetention") && !string.IsNullOrEmpty(settings["VisitorRetention"]))
+                    {
+                        retention = int.Parse(settings["VisitorRetention"]);
+                    }
+                    count = visitorRepository.DeleteVisitors(retention);
+                    log += count.ToString() + " Visitors Purged<br />";
                 }
-                count = visitorRepository.DeleteVisitors(visitorrention);
-                log += count.ToString() + " Visitors Purged<br />";
             }
 
             return log;