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 4f363fac3..3d207da5a 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -20,7 +20,7 @@ var ClientModel = Backbone.Model.extend({
         idTokenValiditySeconds: 600,
         clientName:"",
         clientSecret:"",
-        registeredRedirectUri:[],
+        redirectUris:[],
         authorizedGrantTypes:["authorization_code"],
         scope:[],
         authorities:[],
@@ -198,7 +198,7 @@ var ClientFormView = Backbone.View.extend({
             this.template = _.template($('#tmpl-client-form').html());
         }
 
-        this.registeredRedirectUriCollection = new Backbone.Collection();
+        this.redirectUrisCollection = new Backbone.Collection();
         this.scopeCollection = new Backbone.Collection();
     },
 
@@ -353,7 +353,7 @@ var ClientFormView = Backbone.View.extend({
             clientId:$('#clientId input').val(),
             clientSecret: clientSecret,
             generateClientSecret:generateClientSecret,
-            registeredRedirectUri: this.registeredRedirectUriCollection.pluck("item"),
+            redirectUris: this.redirectUrisCollection.pluck("item"),
             clientDescription:$('#clientDescription textarea').val(),
             logoUrl:$('#logoUrl input').val(),
             authorizedGrantTypes: authorizedGrantTypes,
@@ -362,7 +362,8 @@ var ClientFormView = Backbone.View.extend({
             idTokenValiditySeconds: idTokenValiditySeconds,
             allowRefresh: $('#allowRefresh').is(':checked'),
             allowIntrospection: $('#allowIntrospection input').is(':checked'),
-            scope: scopes
+            scope: scopes,
+            
         });
 
         // post-validate
@@ -408,12 +409,12 @@ var ClientFormView = Backbone.View.extend({
         var _self = this;
 
         // build and bind registered redirect URI collection and view
-        _.each(this.model.get("registeredRedirectUri"), function (registeredRedirectUri) {
-            _self.registeredRedirectUriCollection.add(new URIModel({item:registeredRedirectUri}));
+        _.each(this.model.get("redirectUris"), function (redirectUri) {
+            _self.redirectUrisCollection.add(new URIModel({item:redirectUri}));
         });
 
-        $("#registeredRedirectUri .controls",this.el).html(new ListWidgetView({type:'uri', placeholder: 'http://',
-                                                                                collection: this.registeredRedirectUriCollection}).render().el);
+        $("#redirectUris .controls",this.el).html(new ListWidgetView({type:'uri', placeholder: 'http://',
+                                                                                collection: this.redirectUrisCollection}).render().el);
 
         _self = this;
         // build and bind scopes
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 6c2aabfc0..674ce819e 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -97,7 +97,7 @@
                 </div>
             </div>
 
-            <div class="control-group" id="registeredRedirectUri">
+            <div class="control-group" id="redirectUris">
                 <label class="control-label">Redirect URI(s)</label>
                 <div class="controls">
                 </div>