diff --git a/base_user_role_company/__manifest__.py b/base_user_role_company/__manifest__.py
index 5b1af098..cc22233a 100644
--- a/base_user_role_company/__manifest__.py
+++ b/base_user_role_company/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "User roles by company",
-    "version": "14.0.1.0.0",
+    "version": "12.0.1.0.0",
     "category": "Tools",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/base_user_role_company/models/ir_http.py b/base_user_role_company/models/ir_http.py
index 7eaca704..84a00b3c 100644
--- a/base_user_role_company/models/ir_http.py
+++ b/base_user_role_company/models/ir_http.py
@@ -16,7 +16,8 @@ class IrHttp(models.AbstractModel):
         """
         result = super(IrHttp, self).session_info()
         if self.env.user.role_line_ids:
-            cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
+            cids_str = request.httprequest.cookies.get(
+                "cids", str(self.env.user.company_id.id))
             cids = [int(cid) for cid in cids_str.split(",")]
             self.env.user._set_session_active_roles(cids)
             self.env.user.set_groups_from_roles()
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 14cb869b..3469bb9a 100644
--- a/base_user_role_company/tests/test_role_per_company.py
+++ b/base_user_role_company/tests/test_role_per_company.py
@@ -28,14 +28,14 @@ class TestUserRoleCompany(TransactionCase):
             "login": "test_user",
             "company_ids": [(6, 0, [self.company1.id, self.company2.id])],
             "role_line_ids": [
-                (0, 0, {"role_id": self.roleA.id}),
+                (0, 0, {"role_id": self.roleA.id, "company_id": None}),
                 (0, 0, {"role_id": self.roleB.id, "company_id": self.company1.id}),
                 (0, 0, {"role_id": self.roleC.id, "company_id": self.company1.id}),
                 (0, 0, {"role_id": self.roleC.id, "company_id": self.company2.id}),
             ],
         }
         self.test_user = self.User.create(user_vals)
-        self.User = self.User.with_user(self.test_user)
+        self.User = self.User.sudo(self.test_user)
 
     def test_110_company_1(self):
         "Company 1 selected: Tech and Settings roles are activated"