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 bfc7a961c..177bb9da4 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -29,11 +29,11 @@
                 minlength:3,*/
                 maxlength:200
             },
-            accessTokenTimeout: {
+            accessTokenValiditySeconds: {
                 required: true,
                 type:"number"
             },
-            refreshTokenTimeout: {
+            refreshTokenValiditySeconds: {
                 required: true,
                 type:"number"
             },
@@ -68,8 +68,8 @@
             clientDescription:"",
             clientId:null,
             allowRefresh:false,
-            accessTokenTimeout: 0,
-            refreshTokenTimeout: 0
+            accessTokenValiditySeconds: 0,
+            refreshTokenValiditySeconds: 0
         },
 
         urlRoot:"api/clients"
@@ -196,8 +196,8 @@
                 registeredRedirectUri:$.trim($('#registeredRedirectUri textarea').val()).replace(/ /g,'').split("\n"),
                 clientDescription:$('#clientDescription textarea').val(),
                 allowRefresh:$('#allowRefresh').is(':checked'),
-                accessTokenTimeout: $('#accessTokenTimeout input').val(),
-                refreshTokenTimeout: $('#refreshTokenTimeout input').val(),
+                accessTokenValiditySeconds: $('#accessTokenValiditySeconds input').val(),
+                refreshTokenValiditySeconds: $('#refreshTokenValiditySeconds input').val(),
                 scope:$.map($('#scope textarea').val().replace(/,$/,'').replace(/\s/g,' ').split(","), $.trim)
             });
 
@@ -206,8 +206,8 @@
                     success:function () {
                         app.navigate('clients', {trigger:true});
                     },
-                    error:function () {
-
+                    error:function (model,resp) {
+                        console.error("Oops! The object didn't save correctly.",resp);
                     }
                 });
 
@@ -217,8 +217,8 @@
                         success:function () {
                             app.navigate('clients', {trigger:true});
                         },
-                        error:function () {
-
+                        error:function (model,resp) {
+                            console.error("Oops! The object didn't create correctly.",resp);
                         }
                     });
 
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 d6d01c62c..d1b348116 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -153,25 +153,25 @@
                     </div>
 
                     <div class="span4">
-                        <span class="control-group" id="accessTokenTimeout">
+                        <span class="control-group" id="accessTokenValiditySeconds">
                         <label class="control-label" for="access-token-timeout-seconds" style="">Access Token
                             Timeout</label>
 
                         <div class="controls form-horizontal" style="">
                             <div class="input-append">
-                                <input type="text" class="" value="<%=accessTokenTimeout%>" id="access-token-timeout-seconds" size="16"><span
+                                <input type="text" class="" value="<%=accessTokenValiditySeconds%>" id="access-token-timeout-seconds" size="16"><span
                                     class="add-on">seconds</span>
                             </div>
                             <span class="help-inline">Enter this time in seconds</span>
                         </div>
                         </span>
-                        <span class="control-group" id="refreshTokenTimeout">
+                        <span class="control-group" id="refreshTokenValiditySeconds">
                         <label class="control-label" for="refresh-token-timeout-seconds" style="">Refresh Token
                             Timeout</label>
 
                         <div class="controls form-horizontal" style="">
                             <div class="input-append">
-                                <input type="text" class="" value="<%=refreshTokenTimeout%>" id="refresh-token-timeout-seconds" size="16"><span
+                                <input type="text" class="" value="<%=refreshTokenValiditySeconds%>" id="refresh-token-timeout-seconds" size="16"><span
                                     class="add-on">seconds</span>
                             </div>
                             <span class="help-inline">Enter this time in seconds</span>