diff --git a/web/html/index.html b/web/html/index.html
index 84445fbf..1c6bb0be 100644
--- a/web/html/index.html
+++ b/web/html/index.html
@@ -844,9 +844,11 @@
             text = `<td>${log.Email}</td>`;
           }
 
+          const { locale, timeZone } = Intl.DateTimeFormat().resolvedOptions();
+
           formattedLogs += `
 <tr ${outboundColor}>
-    <td><b>${new Date(log.DateTime).toLocaleString()}</b></td>
+    <td><b>${new Date(log.DateTime).toLocaleString(locale, { timeZone })}</b></td>
     <td>${log.FromAddress}</td>
     <td>${log.ToAddress}</td>
     <td>${log.Inbound}</td>
diff --git a/web/service/server.go b/web/service/server.go
index b7cfc3a7..2526a058 100644
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -794,11 +794,11 @@ func (s *ServerService) GetXrayLogs(
 		for i, part := range parts {
 
 			if i == 0 {
-				dateTime, err := time.Parse("2006/01/02 15:04:05.999999", parts[0]+" "+parts[1])
+				dateTime, err := time.ParseInLocation("2006/01/02 15:04:05.999999", parts[0]+" "+parts[1], time.Local)
 				if err != nil {
 					continue
 				}
-				entry.DateTime = dateTime
+				entry.DateTime = dateTime.UTC()
 			}
 
 			if part == "from" {