diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 013f2dda0..d5f9f7b72 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -237,16 +237,16 @@ class RoleManager(models.Manager):
 
 class OrgRoleManager(RoleManager):
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
         from rbac.const import Scope
         self.scope = Scope.org
+        super().__init__(*args, **kwargs)
 
 
 class SystemRoleManager(RoleManager):
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
         from rbac.const import Scope
         self.scope = Scope.system
+        super().__init__(*args, **kwargs)
 
 
 class RoleMixin:
diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py
index 7421c9cc1..b998e8f6d 100644
--- a/apps/users/serializers/user.py
+++ b/apps/users/serializers/user.py
@@ -49,6 +49,8 @@ class RolesSerializerMixin(serializers.Serializer):
             return fields
 
         action = view.action or 'list'
+        if action in ('partial_bulk_update', 'bulk_update', 'partial_update', 'update'):
+            action = 'create'
         model_cls_field_mapper = {
             SystemRoleBinding: ['system_roles', 'system_roles_display'],
             OrgRoleBinding: ['org_roles', 'system_roles_display']