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 9f9a2878b..98be97a2a 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
@@ -1118,7 +1118,7 @@ var AppRouter = Backbone.Router.extend({
     	// set the URL for the collection
     	claims.url = 'api/claims/' + rsid;
     	
-    	var view = new ClaimListView({model: claims});
+    	var view = new ClaimListView({model: claims, rs: rs});
     	
     	view.load(function() {
     		$('#content').html(view.render().el);
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js b/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
index 4cb8ffc75..305260f4c 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
@@ -231,6 +231,11 @@ var ClaimListView = Backbone.View.extend({
     	
     	this.model.sync('update', this.model, {
     		success:function() {
+    			// update our copy of the resource set object (if we have it)
+    			if (_self.options.rs != null) {
+    				rs.set({claimsRequired: _self.model.toJSON()}, {trigger: false});
+    			}
+    			
     	    	app.navigate('user/policy', {trigger: true});
     		},
             error:function (error, response) {