diff --git a/templates/admin_users.templ b/templates/admin_users.templ
index 8953a28..0a9e8ad 100644
--- a/templates/admin_users.templ
+++ b/templates/admin_users.templ
@@ -86,7 +86,7 @@ templ AdminUsers(currentUser User, users []User, adminCount int) {
 										</td>
 										<!-- Created -->
 										<td class="px-6 py-4 whitespace-nowrap">
-											<div class="text-sm" style="color: var(--text-secondary)">{ user.CreatedAt.Format("01-02-2006") }</div>
+											<div class="text-sm" style="color: var(--text-secondary)">{ FormatInTimezone(user.CreatedAt, currentUser.Timezone) }</div>
 										</td>
 										<!-- Actions -->
 										<td class="px-6 py-4 whitespace-nowrap text-right">
diff --git a/templates/book_detail.templ b/templates/book_detail.templ
index a0db0b6..3614b85 100644
--- a/templates/book_detail.templ
+++ b/templates/book_detail.templ
@@ -250,7 +250,7 @@ templ BookDetail(user User, book handlers.MediaDetail, errorMessage string) {
 							if book.ReadingProgress.LastReadAt.Valid {
 								<div>
 									<p style="color: var(--text-secondary)">Last Read</p>
-									<p>{ templates.FormatTimestamptzInTimezone(book.ReadingProgress.LastReadAt, user.Timezone) }</p>
+									<p>{ FormatTimestamptzInTimezone(book.ReadingProgress.LastReadAt, user.Timezone) }</p>
 								</div>
 							}
 							if book.ReadingProgress.LastSyncSource.Valid {
@@ -501,7 +501,7 @@ templ BookDetail(user User, book handlers.MediaDetail, errorMessage string) {
 				}
 			</div>
 			<!-- Modals -->
-			@ProgressSyncModal(book)
+			@ProgressSyncModal(user, book)
 			@NotesHighlightsModal(book)
 			@ErrorToast(errorMessage)
 		</body>
diff --git a/templates/book_detail_modals.templ b/templates/book_detail_modals.templ
index b5fe655..3d58f49 100644
--- a/templates/book_detail_modals.templ
+++ b/templates/book_detail_modals.templ
@@ -6,7 +6,7 @@ import (
 )
 
 // ProgressSyncModal shows progress from all devices for manual review
-templ ProgressSyncModal(book handlers.MediaDetail) {
+templ ProgressSyncModal(user User, book handlers.MediaDetail) {
 	<div
 		id="progress-sync-modal"
 		class="hidden fixed inset-0 z-50 flex items-center justify-center overflow-y-auto"
@@ -65,7 +65,7 @@ templ ProgressSyncModal(book handlers.MediaDetail) {
 										{ source }
 									</span>
 									<p class="text-xs" style="color: var(--text-secondary);">
-										{ data.Timestamp.Format("01-02-2006 03:04 PM:05") }
+										{ FormatInTimezone(data.Timestamp, user.Timezone) }
 									</p>
 								</div>
 								<div class="text-right">
diff --git a/templates/conflicts.templ b/templates/conflicts.templ
index d8bb326..1eb1b67 100644
--- a/templates/conflicts.templ
+++ b/templates/conflicts.templ
@@ -111,7 +111,7 @@ templ Conflicts(user User, conflicts []handlers.ConflictDetailResponse, total in
 								</button>
 							</div>
 							<div class="text-sm" style="color: var(--text-secondary)">
-								Created: { conflict.CreatedAt.Format("01-02-2006 03:04:05 PM") }
+								Created: { FormatInTimezone(conflict.CreatedAt, user.Timezone) }
 								if conflict.ResolvedBy != "" {
 									| Resolved by: { conflict.ResolvedBy }
 								}
diff --git a/templates/devices.templ b/templates/devices.templ
index 2f8141e..aaee178 100644
--- a/templates/devices.templ
+++ b/templates/devices.templ
@@ -80,7 +80,7 @@ templ Devices(user User, devices []handlers.DeviceInfo, pendingRegistrations []P
 										<div class="flex justify-between">
 											<span style="color: var(--text-secondary)">Last Sync</span>
 											if device.LastSync != nil {
-												<span style="color: var(--text-primary)">{ device.LastSync.Format("01-02-2006 03:04 PM") }</span>
+												<span style="color: var(--text-primary)">{ FormatInTimezone(*device.LastSync, user.Timezone) }</span>
 											} else {
 												<span style="color: var(--text-primary)">Never</span>
 											}
@@ -88,7 +88,7 @@ templ Devices(user User, devices []handlers.DeviceInfo, pendingRegistrations []P
 										<div class="flex justify-between">
 											<span style="color: var(--text-secondary)">Last Seen</span>
 											if device.LastSeen != nil {
-												<span style="color: var(--text-primary)">{ device.LastSeen.Format("01-02-2006 03:04 PM") }</span>
+												<span style="color: var(--text-primary)">{ FormatInTimezone(*device.LastSeen, user.Timezone) }</span>
 											} else {
 												<span style="color: var(--text-primary)">Never</span>
 											}