diff --git a/CTFd/templates/admin/correct_keys.html b/CTFd/templates/admin/correct_keys.html
index a96ab41a..e36eb804 100644
--- a/CTFd/templates/admin/correct_keys.html
+++ b/CTFd/templates/admin/correct_keys.html
@@ -50,7 +50,7 @@
             <tr>
                 <td class="text-center team" id="{{ solve.teamid }}"><a href="/admin/team/{{ solve.teamid }}">{{ solve.team_name }}</a>
                 <td class="text-center chal" id="{{ solve.chalid }}">{{ solve.chal_name }}</td>
-                <td class="text-center solve-time">{{ solve.date|unix_time_millis }}</td>
+                <td class="text-center solve-time"><script>document.write( moment({{ solve.date|unix_time_millis }}).local().format('MMMM Do, h:mm:ss A'))</script></td>
                 <td class="text-center">{{ solve.flag }}</td>
                 <td class="text-center"><i class="fa fa-times"></i></td>
             </tr>
diff --git a/CTFd/templates/admin/wrong_keys.html b/CTFd/templates/admin/wrong_keys.html
index 7e5a22c6..3ed53ba8 100644
--- a/CTFd/templates/admin/wrong_keys.html
+++ b/CTFd/templates/admin/wrong_keys.html
@@ -57,7 +57,7 @@
             <tr>
                 <td class="text-center team" id="{{ wrong_key.team }}"><a href="/admin/team/{{ wrong_key.team }}">{{ wrong_key.team_name }}</a>
                 <td class="text-center chal" id="{{ wrong_key.chalid }}">{{ wrong_key.chal_name }}</td>
-                <td class="text-center solve-time">{{ wrong_key.date|unix_time_millis }}</td>
+                <td class="text-center solve-time"><script>document.write( moment({{ wrong_key.date|unix_time_millis }}).local().format('MMMM Do, h:mm:ss A'))</script></td>
                 <td class="text-center">{{ wrong_key.flag }}</td>
                 <td class="text-center"><i class="fa fa-times"></i></td>
             </tr>