diff --git a/app/controllers/ops_controller/ops_rbac.rb b/app/controllers/ops_controller/ops_rbac.rb
index cec40d95848..e3b06f273f2 100644
--- a/app/controllers/ops_controller/ops_rbac.rb
+++ b/app/controllers/ops_controller/ops_rbac.rb
@@ -717,6 +717,7 @@ def rbac_edit_save_or_add(what, rbac_suffix = what)
 
     case key
     when :user
+      return unless load_edit("rbac_#{what}_edit__#{id}", "replace_cell__explorer")
       record = @edit[:user_id] ? User.find_by(:id => @edit[:user_id]) : User.new
       validated = rbac_user_validate?
       rbac_user_set_record_vars(record)
@@ -726,6 +727,7 @@ def rbac_edit_save_or_add(what, rbac_suffix = what)
       rbac_group_set_record_description_role(record) # Set new Description, Role and Tenant for a new Group
       rbac_group_set_record_vars(record) if validated
     when :role  then
+      return unless load_edit("rbac_#{what}_edit__#{id}", "replace_cell__explorer")
       record = @edit[:role_id] ? MiqUserRole.find_by(:id => @edit[:role_id]) : MiqUserRole.new
       validated = rbac_role_validate?
       rbac_role_set_record_vars(record)