diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
index 97beaae..124156b 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
@@ -76,10 +76,10 @@
                 <tr>
                     <td class="valign text-center">
                         <!-- ko if: State -->
-                        <span class="label label-success" data-toggle="tooltip" data-placement="top" data-bind="attr:{title: LastEventTime}" style="display: block">IN</span>
+                        <span class="label label-success" data-toggle="tooltip" data-placement="top" title="" data-bind="attr:{'title': $root.convertToDisplayDateTime(LastEventDateTime)}" style="display: block">IN</span>
                         <!-- /ko -->
                         <!-- ko if: !State -->
-                        <span class="label label-danger" data-toggle="tooltip" data-placement="top" data-bind="attr:{title: LastEventTime}" style="display: block">OUT</span>
+                        <span class="label label-danger" data-toggle="tooltip" data-placement="top" title="" data-bind="attr:{'title': $root.convertToDisplayDateTime(LastEventDateTime)}" style="display: block">OUT</span>
                         <!-- /ko -->
                     </td>
                     <td class="valign" data-bind="text: FirstName"></td>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index 37bed76..93973f6 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -142,7 +142,7 @@
     };
     self.convertToDisplayTime = function (dateValue) {
         var date = new Date(dateValue);
-        return date.getHours() + ":" + (date.getMinutes() < 10 ? '0' : '') + date.getMinutes();
+        return date.getHours() + ":" + self.padNumber(date.getMinutes());
     };
     self.correctLogOffset = function (logCount) {
         if (logCount % 2 !== 0) {
@@ -156,6 +156,18 @@
     self.getTimeLogEntryArrayLength = function(maxDailyLogs) {
         return Math.round(maxDailyLogs/2);
     };
+    self.padNumber = function(number) {
+        return (number < 10 ? '0' : '') + number;
+    }
+    self.convertToDisplayDateTime = function (dateValue) {
+        var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02
+        return date.getDay() + " "
+            + date.toLocaleString("en-us", { month: "long" }) + " "
+            + (date.getYear()-100) + "  "
+            + self.padNumber(date.getHours()) + ":"
+            + self.padNumber(date.getMinutes()) + ":"
+            + self.padNumber(date.getSeconds());
+    };
     self.dismissAlert = function(data, event) {
         self.errorData(null);
     };
@@ -229,6 +241,7 @@
         var url = self.createRequestUrl(self.apiEndpoints.getUserList, args, false);
         $.getJSON(url, function (res) {
             self.userList(res);
+            $('[data-toggle="tooltip"]').tooltip();
         }).fail(function (response, status, error) {
             console.log("error - getusers");
             var errObj = self.processRequestFailure(response, status, error);