diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/app.js
index 7e5b09ee3..7527a8ecb 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -507,15 +507,15 @@
                 $("#refreshTokenValiditySeconds", this.$el).hide();
             }
 
-            if (!this.model.get("accessTokenValiditySeconds")) {
+            if (this.model.get("accessTokenValiditySeconds") == null) {
                 $("#access-token-timeout-seconds", this.$el).prop('disabled',true);
             }
 
-            if (!this.model.get("refreshTokenValiditySeconds")) {
+            if (this.model.get("refreshTokenValiditySeconds") == null) {
                 $("#refresh-token-timeout-seconds", this.$el).prop('disabled',true);
             }
 
-            if (!this.model.get("idTokenValiditySeconds")) {
+            if (this.model.get("idTokenValiditySeconds") == null) {
                 $("#id-token-timeout-seconds", this.$el).prop('disabled',true);
             }
 
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 5bfa949d8..7b5cfe7ac 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -177,7 +177,7 @@
                     <div class="input-append">
                         <input type="text" class="" value="<%=(accessTokenValiditySeconds == null ? '' : accessTokenValiditySeconds)%>" id="access-token-timeout-seconds" size="16"><span
                             class="add-on">seconds</span>
-                        <input type="checkbox" id="disableAccessTokenTimeout" <%=(accessTokenValiditySeconds == null ? 'checked' : '')%>/> disable?
+                        <input type="checkbox" id="disableAccessTokenTimeout" <%=(accessTokenValiditySeconds == null ? 'checked' : '')%>/> disable timeout
                     </div>
                     <p class="help-block">Enter this time in seconds.</p>
                 </div>
@@ -191,7 +191,7 @@
                     <div class="input-append">
                         <input type="text" class="" value="<%=(idTokenValiditySeconds == null ? '' : idTokenValiditySeconds)%>" id="id-token-timeout-seconds" size="16"><span
                             class="add-on">seconds</span>
-                        <input type="checkbox" id="disableIDTokenTimeout" <%=(idTokenValiditySeconds == null ? 'checked' : '')%>/> disable?
+                        <input type="checkbox" id="disableIDTokenTimeout" <%=(idTokenValiditySeconds == null ? 'checked' : '')%>/> disable timeout
                     </div>
                     <p class="help-block">Enter this time in seconds.</p>
                 </div>
@@ -213,7 +213,7 @@
                     <div class="input-append">
                         <input type="text" class="" value="<%=(refreshTokenValiditySeconds == null ? '' : refreshTokenValiditySeconds)%>" id="refresh-token-timeout-seconds" size="16"><span
                             class="add-on">seconds</span>
-                            <input type="checkbox" id="disableRefreshTokenTimeout" <%=(refreshTokenValiditySeconds == null ? 'checked' : '')%>/> disable?
+                            <input type="checkbox" id="disableRefreshTokenTimeout" <%=(refreshTokenValiditySeconds == null ? 'checked' : '')%>/> disable timeout
                     </div>
                     <p class="help-block">Enter this time in seconds.</p>
                 </div>