diff --git a/openid-connect-server/src/main/webapp/resources/js/client.js b/openid-connect-server/src/main/webapp/resources/js/client.js
index 7df11b905..5661a8a98 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -288,9 +288,9 @@ var ClientFormView = Backbone.View.extend({
     events:{
         "click .btn-save":"saveClient",
         "click #allowRefresh" : "toggleRefreshTokenTimeout",
-        "click #disableAccessTokenTimeout" : function(){ $("#access-token-timeout-seconds", this.$el).prop('disabled',!$("#access-token-timeout-seconds", this.$el).prop('disabled')); },
-        "click #disableIDTokenTimeout" : function(){ $("#id-token-timeout-seconds", this.$el).prop('disabled',!$("#id-token-timeout-seconds", this.$el).prop('disabled')); },
-        "click #disableRefreshTokenTimeout" : function(){ $("#refresh-token-timeout-seconds", this.$el).prop('disabled',!$("#refresh-token-timeout-seconds", this.$el).prop('disabled')); },
+        "click #disableAccessTokenTimeout" : function(){ $("#access-token-timeout-time", this.$el).prop('disabled',!$("#access-token-timeout-time", this.$el).prop('disabled')); },
+        "click #disableIDTokenTimeout" : function(){ $("#id-token-timeout-time", this.$el).prop('disabled',!$("#id-token-timeout-time", this.$el).prop('disabled')); },
+        "click #disableRefreshTokenTimeout" : function(){ $("#refresh-token-timeout-time", this.$el).prop('disabled',!$("#refresh-token-timeout-time", this.$el).prop('disabled')); },
         "click .btn-cancel": function() { window.history.back(); return false; },
         "change #requireClientSecret":"toggleRequireClientSecret",
         "change #displayClientSecret":"toggleDisplayClientSecret",
@@ -616,15 +616,15 @@ var ClientFormView = Backbone.View.extend({
         }
 
         if (this.model.get("accessTokenValiditySeconds") == null) {
-            $("#access-token-timeout-seconds", this.$el).prop('disabled',true);
+            $("#access-token-timeout-time", this.$el).prop('disabled',true);
         }
 
         if (this.model.get("refreshTokenValiditySeconds") == null) {
-            $("#refresh-token-timeout-seconds", this.$el).prop('disabled',true);
+            $("#refresh-token-timeout-time", this.$el).prop('disabled',true);
         }
 
         if (this.model.get("idTokenValiditySeconds") == null) {
-            $("#id-token-timeout-seconds", this.$el).prop('disabled',true);
+            $("#id-token-timeout-time", this.$el).prop('disabled',true);
         }
 
         // toggle other dynamic fields
diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index 842f9c3ae..d10bd4c45 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -361,7 +361,7 @@
 						</label>
 					</div>
                     <div class="form-horizontal">
-                        <input type="text" class="" value="<%=(accessTokenValiditySeconds == null ? '' : accessTokenValiditySeconds)%>" id="access-token-timeout-seconds" size="16" style="width:120px;">
+                        <input type="text" class="" value="<%=(accessTokenValiditySeconds == null ? '' : accessTokenValiditySeconds)%>" id="access-token-timeout-time" size="16" style="width:120px;">
 						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>
@@ -382,7 +382,7 @@
 						</label>
 					</div>
                     <div class="form-horizontal">
-                        <input type="text" class="" value="<%=(idTokenValiditySeconds == null ? '' : idTokenValiditySeconds)%>" id="id-token-timeout-seconds" size="16" style="width:120px;">
+                        <input type="text" class="" value="<%=(idTokenValiditySeconds == null ? '' : idTokenValiditySeconds)%>" id="id-token-timeout-time" size="16" style="width:120px;">
 						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>
@@ -415,7 +415,7 @@
 						</label>
 					</div>
                     <div class="form-horizontal">
-                        <input type="text" class="" value="<%=(refreshTokenValiditySeconds == null ? '' : refreshTokenValiditySeconds)%>" id="refresh-token-timeout-seconds" size="16" style="width:120px;">
+                        <input type="text" class="" value="<%=(refreshTokenValiditySeconds == null ? '' : refreshTokenValiditySeconds)%>" id="refresh-token-timeout-time" size="16" style="width:120px;">
 						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>