diff --git a/wwwroot/js/app.ravLicense.js b/wwwroot/js/app.ravLicense.js
index 132db4f..bc73543 100644
--- a/wwwroot/js/app.ravLicense.js
+++ b/wwwroot/js/app.ravLicense.js
@@ -131,25 +131,46 @@ app.ravLicense = (function () {
         $("#subusercountblock").toggleClass("d-none");
         $("#subcustcountblock").toggleClass("d-none");
 
-        $('#licenseExpires').prop('checked',  !$('#perpetual').prop('checked'));
+        $("#licenseExpires").prop("checked", !$("#perpetual").prop("checked"));
 
         return false; //prevent default
     };
 
     onLicenseExpiresSetOneMonth = function (event) {
-      event.preventDefault();
-      $('#licenseExpirationDate').val( moment().add(1, 'months').toISOString().substring(0, 10));
+        event.preventDefault();
+        $("#licenseExpirationDate").val(
+            moment().add(1, "months").toISOString().substring(0, 10)
+        );
 
-      return false; //prevent default
-  };
+        return false; //prevent default
+    };
 
-  onLicenseExpiresSetOneYear = function (event) {
-    event.preventDefault();
-    $('#licenseExpirationDate').val( moment().add(1, 'years').toISOString().substring(0, 10));
+    onLicenseExpiresSetOneYear = function (event) {
+        event.preventDefault();
+        $("#licenseExpirationDate").val(
+            moment().add(1, "years").toISOString().substring(0, 10)
+        );
 
-    return false; //prevent default
-};
+        return false; //prevent default
+    };
 
+    onMaintExpiresSetOneMonth = function (event) {
+        event.preventDefault();
+        $("#maintenanceExpirationDate").val(
+            moment().add(1, "months").toISOString().substring(0, 10)
+        );
+
+        return false; //prevent default
+    };
+
+    onMaintExpiresSetOneYear = function (event) {
+        event.preventDefault();
+        $("#maintenanceExpirationDate").val(
+            moment().add(1, "years").toISOString().substring(0, 10)
+        );
+
+        return false; //prevent default
+    };
 
     // onSelectAllAddOns = function (event) {
     //     event.preventDefault();
@@ -260,9 +281,23 @@ app.ravLicense = (function () {
         $("#btn-revoke").bind("click", onRevoke);
         $("#perpetual").bind("change", onPerpetualChanged);
 
-        $("#btn-license-expires-plus-one-month").bind("click", onLicenseExpiresSetOneMonth);
-        $("#btn-license-expires-plus-one-year").bind("click", onLicenseExpiresSetOneYear);
-        
+        $("#btn-license-expires-plus-one-month").bind(
+            "click",
+            onLicenseExpiresSetOneMonth
+        );
+        $("#btn-license-expires-plus-one-year").bind(
+            "click",
+            onLicenseExpiresSetOneYear
+        );
+
+        $("#btn-maint-expires-plus-one-month").bind(
+            "click",
+            onMaintExpiresSetOneMonth
+        );
+        $("#btn-maint-expires-plus-one-year").bind(
+            "click",
+            onMaintExpiresSetOneYear
+        );
     };
 
     // return public methods
diff --git a/wwwroot/js/templates/app.ravLicense.handlebars b/wwwroot/js/templates/app.ravLicense.handlebars
index 7298d3b..e252f7e 100644
--- a/wwwroot/js/templates/app.ravLicense.handlebars
+++ b/wwwroot/js/templates/app.ravLicense.handlebars
@@ -40,6 +40,8 @@
                         name="maintenanceExpirationDate"
                         value=""
                     />
+                     <button id="btn-maint-expires-plus-one-month" class="btn btn-outline-primary">+1 Month</button>
+                    <button id="btn-maint-expires-plus-one-year" class="btn btn-outline-primary">+1 Year</button>
                 </div>
             </div>