diff --git a/authority/static/include.js b/authority/static/include.js
index d759fc255c6f66e7f3396ef455d1587cd2feb845..d2c6a6d7f1820be6b5c1945c196bc993a8ba774f 100644
--- a/authority/static/include.js
+++ b/authority/static/include.js
@@ -534,7 +534,7 @@ if (!navigator.id.getVerifiedEmail) {
       var jwtContents = JSON.parse(window.atob(jwtBlob.split(".")[1]));
       for (var k in obj) {
         if (obj.hasOwnProperty(k) && obj[k] === undefined) {
-          if (typeof jwtContents[k] === 'string') obj[k] = jwtContents[k];
+          if (typeof jwtContents[k] === 'string' || typeof jwtContents[k] === 'number') obj[k] = jwtContents[k];
         }
       }
     } catch(e) {
diff --git a/rp/index.html b/rp/index.html
index ad453718f33caaa401b23b8ff45876ded9b34a2f..feb3c91f1161089aabe16eec08fb3295f73812bb 100644
--- a/rp/index.html
+++ b/rp/index.html
@@ -84,7 +84,10 @@ a:hover { border-bottom: 2px solid black ; }
     for (var k in obj) {
       if (obj.hasOwnProperty(k) && typeof obj[k] === 'string') {
         htmlRep += "<b>" + k + ":</b> " + obj[k] + "<br/>";
+      } else if (k === 'valid-until') {
+        htmlRep += "<b>" + k + ":</b> " + (new Date(obj[k])).toString() + "<br/>";
       }
+
     }
     return htmlRep;
   }