diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
index e31d10ed..0d0e89c9 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
@@ -64,14 +64,14 @@
                             data: 'beginValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.beginValidity);
+                                return formatCertificateDate(full.beginValidity);
                             }
                         },
                         {
                             data: 'endValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.endValidity);
+                                return formatCertificateDate(full.endValidity);
                             }
                         },
                         {
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
index 4e2be128..0c37bc8c 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
@@ -56,14 +56,14 @@
                             data: 'beginValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(data);
+                                return formatCertificateDate(data);
                             }
                         },
                         {
                             data: 'endValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(data);
+                                return formatCertificateDate(data);
                             }
                         },
                         {
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
index 178c0391..16d93e31 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
@@ -79,14 +79,14 @@
                             data: 'beginValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.beginValidity);
+                                return formatCertificateDate(full.beginValidity);
                             }
                         },
                         {
                             data: 'endValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.endValidity);
+                                return formatCertificateDate(full.endValidity);
                             }
                         },
                         {
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
index 4ae7a3e1..06a202e8 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
@@ -101,7 +101,7 @@
 
                 //Format validity time
                 $("#validity span").each(function(){
-                    $(this).text(formatDateTime($(this).text()));
+                    $(this).text(formatCertificateDate($(this).text()));
                 });
 
                 //Convert byte array to string
@@ -120,14 +120,14 @@
                             data: 'beginValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.beginValidity);
+                                return formatCertificateDate(full.beginValidity);
                             }
                         },
                         {
                             data: 'endValidity',
                             searchable:false,
                             render: function (data, type, full, meta) {
-                                return formatDateTime(full.endValidity);
+                                return formatCertificateDate(full.endValidity);
                             }
                         },
                         {
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/validation-reports.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/validation-reports.jsp
index f74fdbe8..c3c82b68 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/validation-reports.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/validation-reports.jsp
@@ -100,7 +100,7 @@
                         name: 'createTime',
                         searchable: false,
                         render: function (data, type, full, meta) {
-                            return formatDateTime(full.createTime);
+                            return formatCertificateDate(full.createTime);
                         }
                     },
                     {