diff --git a/static/js/index.js b/static/js/index.js
index f812676..98277f5 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -133,6 +133,13 @@ window.app = Vue.createApp({
       return new Date(dateString).toLocaleDateString()
     },
 
+    formatDateTime(dateString) {
+      if (!dateString) return ''
+      const date = new Date(dateString)
+      return date.toLocaleDateString() + ' ' + date.toLocaleTimeString('en-US', { hour12: false })
+    },
+
+
     // Configuration Methods
     async getLamassuConfig() {
       try {
diff --git a/templates/myextension/index.html b/templates/myextension/index.html
index 6c5ecdf..d4c4dee 100644
--- a/templates/myextension/index.html
+++ b/templates/myextension/index.html
@@ -346,8 +346,8 @@
                   <q-badge v-else-if="lamassuConfig.test_connection_success === false" color="red">Failed</q-badge>
                   <q-badge v-else color="grey">Not tested</q-badge>
                 </p>
-                <p><strong>Last Poll:</strong> ${ lamassuConfig.last_poll_time ? formatDate(lamassuConfig.last_poll_time) : 'Not yet run' }</p>
-                <p><strong>Last Success:</strong> ${ lamassuConfig.last_successful_poll ? formatDate(lamassuConfig.last_successful_poll) : 'Never' }</p>
+                <p><strong>Last Poll:</strong> ${ lamassuConfig.last_poll_time ? formatDateTime(lamassuConfig.last_poll_time) : 'Not yet run' }</p>
+                <p><strong>Last Success:</strong> ${ lamassuConfig.last_successful_poll ? formatDateTime(lamassuConfig.last_successful_poll) : 'Never' }</p>
               </div>
               <div v-else>
                 <p><strong>Status:</strong> <q-badge color="orange">Not configured</q-badge></p>