diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index f9eb9fae..49a857ac 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -214,6 +214,9 @@ Vue.prototype.$ay = {
   },
   dt: function(timestamp) {
     return locale.utcDateToShortDateAndTimeLocalized(timestamp);
+  },
+  sd: function(timestamp) {
+    return locale.utcDateToShortDateLocalized(timestamp);
   }
 };
 new Vue({
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index 74153730..852156c4 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -26,16 +26,20 @@
                   currentLicenseInfo.keySerial
                 }}</span>
               </div>
-              <div>
+              <div v-if="currentLicenseInfo.licenseWillExpire">
                 {{ $ay.t("LicenseExpiration") }}
                 <span class="font-weight-bold ml-1">{{
-                  $ay.dt(currentLicenseInfo.licenseExpiration)
+                  $ay.sd(currentLicenseInfo.licenseExpiration)
                 }}</span>
               </div>
-              <div>
+              <div
+                v-bind:class="{
+                  'red--text text-h6': currentLicenseInfo.maintenanceExpired
+                }"
+              >
                 {{ $ay.t("SupportedUntil") }}
                 <span class="font-weight-bold ml-1">{{
-                  $ay.dt(currentLicenseInfo.maintenanceExpiration)
+                  $ay.sd(currentLicenseInfo.maintenanceExpiration)
                 }}</span>
               </div>