diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 972e66a2..2bdbddbf 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -18,6 +18,5 @@ class IrHttp(models.AbstractModel):
         if self.env.user.role_line_ids:
             cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
             cids = [int(cid) for cid in cids_str.split(",")]
-            # The first element of cids is the currently selected company
-            self.env.user.set_groups_from_roles(company_id=cids[0])
+            self.env.user.with_context(active_company_ids=cids).set_groups_from_roles()
         return result
diff --git a/base_user_role_company/models/user.py b/base_user_role_company/models/user.py
index 1a2f6296..f050be47 100644
--- a/base_user_role_company/models/user.py
+++ b/base_user_role_company/models/user.py
@@ -21,15 +21,21 @@ class ResUsers(models.Model):
 
     def _get_enabled_roles(self):
         res = super()._get_enabled_roles()
-        # Enable only the Roles corresponing to the currently selected company
         if self.role_line_ids:
-            res = res.filtered(
-                lambda x: not x.company_id or x.company_id == self.env.company
-            )
+            active_roles = self.env["res.users.role.line"]
+            if self.env.context.get("active_company_ids"):
+                company_ids = self.env.context.get("active_company_ids")
+            else:
+                company_ids = self.company_id.ids
+            for role_line in self.role_line_ids:
+                if not role_line.company_id:
+                    active_roles |= role_line
+                elif role_line.company_id.id in company_ids:
+                    role_line_companies = self.role_line_ids.filtered(
+                        lambda x, rl=role_line: x.role_id == rl.role_id
+                        and x.company_id.id in company_ids
+                    )
+                    if len(role_line_companies) == len(company_ids):
+                        active_roles |= role_line
+            return active_roles
         return res
-
-    def set_groups_from_roles(self, force=False, company_id=False):
-        # When using the Company Switcher widget, the self.env.company is not yet set
-        if company_id:
-            self = self.with_company(company_id)
-        return super().set_groups_from_roles(force=force)
diff --git a/base_user_role_company/tests/test_role_per_company.py b/base_user_role_company/tests/test_role_per_company.py
index 9b1ac1fc..98b0c50b 100644
--- a/base_user_role_company/tests/test_role_per_company.py
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -45,14 +45,32 @@ class TestUserRoleCompany(TransactionCase):
 
     def test_110_company_1(self):
         "Company 1 selected: Roles A, B and C are enabled"
-        self.test_user.set_groups_from_roles(company_id=self.company1.id)
+        self.test_user.with_context(
+            active_company_ids=self.company1.ids
+        ).set_groups_from_roles()
         expected = self.groupA | self.groupB | self.groupC
         found = self.test_user.groups_id.filtered(lambda x: x in expected)
         self.assertEqual(expected, found)
 
     def test_120_company_2(self):
         "Company 2 selected: Roles A and C are enabled"
-        self.test_user.set_groups_from_roles(company_id=self.company2.id)
+        self.test_user.with_context(
+            active_company_ids=self.company2.ids
+        ).set_groups_from_roles()
+        enabled = self.test_user.groups_id
+        expected = self.groupA | self.groupC
+        found = enabled.filtered(lambda x: x in expected)
+        self.assertEqual(expected, found)
+
+        not_expected = self.groupB
+        found = enabled.filtered(lambda x: x in not_expected)
+        self.assertFalse(found)
+
+    def test_130_all_company(self):
+        "All Company selected: Roles A and C are enabled"
+        self.test_user.with_context(
+            active_company_ids=[self.company1.id, self.company2.id]
+        ).set_groups_from_roles()
         enabled = self.test_user.groups_id
         expected = self.groupA | self.groupC
         found = enabled.filtered(lambda x: x in expected)
diff --git a/base_user_role_company/views/role.xml b/base_user_role_company/views/role.xml
index 9cb06b7e..0a0a22e3 100644
--- a/base_user_role_company/views/role.xml
+++ b/base_user_role_company/views/role.xml
@@ -5,6 +5,9 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base_user_role.view_res_users_form_inherit" />
         <field name="arch" type="xml">
+            <field name="role_id" position="attributes">
+                <attribute name="domain">[]</attribute>
+            </field>
             <xpath
                 expr="//field[@name='role_line_ids']//field[@name='role_id']"
                 position="after"