diff --git a/application/Espo/Services/User.php b/application/Espo/Services/User.php
index 5bfbc2885d..29e7fbc697 100644
--- a/application/Espo/Services/User.php
+++ b/application/Espo/Services/User.php
@@ -433,5 +433,16 @@ class User extends Record
     {
         $this->getFileManager()->removeFile('data/cache/application/acl/' . $id . '.php');
     }
+
+    protected function afterMassUpdate(array $idList, array $data)
+    {
+        parent::afterMassUpdate($idList, $data);
+
+        if (array_key_exists('rolesIds', $data) || array_key_exists('teamsIds', $data)) {
+            foreach ($idList as $id) {
+                $this->clearRoleCache($id);
+            }
+        }
+    }
 }
 
diff --git a/client/src/views/user/record/list.js b/client/src/views/user/record/list.js
index 51de9a3cc4..1b32ed19b2 100644
--- a/client/src/views/user/record/list.js
+++ b/client/src/views/user/record/list.js
@@ -34,7 +34,7 @@ Espo.define('views/user/record/list', 'views/record/list', function (Dep) {
 
         massActionList: ['remove', 'massUpdate', 'export'],
 
-        checkAllResultDisabled: true
+        checkAllResultMassActionList: ['massUpdate', 'export'],
 
     });