diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
index bb24daa2d..122d789c4 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
@@ -927,7 +927,7 @@ var AppRouter = Backbone.Router.extend({
     		client.set({
         		require_auth_time:true,
         		default_max_age:60000,
-        		scope: _.uniq(_.flatten(app.systemScopeList.defaultDynRegScopes().pluck("value"))).join(" "),
+        		scope: _.uniq(_.flatten(app.systemScopeList.defaultUnrestrictedScopes().pluck("value"))).join(" "),
         		token_endpoint_auth_method: 'client_secret_basic',
         		grant_types: ["authorization_code"],
         		response_types: ["code"],
@@ -997,7 +997,7 @@ var AppRouter = Backbone.Router.extend({
     		}
     		
     		client.set({
-        		scope: _.uniq(_.flatten(app.systemScopeList.defaultDynRegScopes().pluck("value"))).join(" "),
+        		scope: _.uniq(_.flatten(app.systemScopeList.defaultUnrestrictedScopes().pluck("value"))).join(" "),
         		token_endpoint_auth_method: 'client_secret_basic',
         		contacts: contacts
         	}, { silent: true });
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
index ce72b33a8..d1f766c79 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
@@ -468,7 +468,7 @@ var DynRegEditView = Backbone.View.extend({
 
         var scopeView = new ListWidgetView({
         	placeholder: $.t('client.client-form.scope-placeholder'), 
-        	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))), 
+        	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.unrestrictedScopes().pluck("value"))), 
         	helpBlockText: $.t('client.client-form.scope-help'),
             collection: this.scopeCollection});
         $("#scope .controls",this.el).html(scopeView.render().el);
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
index 781218a34..f01a21df2 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
@@ -355,7 +355,7 @@ var ResRegEditView = Backbone.View.extend({
 
         var scopeView = new ListWidgetView({
         	placeholder: $.t('client.client-form.scope-placeholder'), 
-        	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))), 
+        	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.unrestrictedScopes().pluck("value"))), 
         	helpBlockText: $.t('rsreg.client-form.scope-help'),
             collection: this.scopeCollection});
         $("#scope .controls",this.el).html(scopeView.render().el);