diff --git a/project_role/models/project_project.py b/project_role/models/project_project.py
index 0fb4510b..c611e7fa 100644
--- a/project_role/models/project_project.py
+++ b/project_role/models/project_project.py
@@ -23,14 +23,14 @@ class ProjectProject(models.Model):
     @api.model
     def _default_inherit_assignments(self):
         company = self.env["res.company"].browse(
-            self._context.get("company_id", self.env.user.company_id.id)
+            self._context.get("company_id", self.env.company.id)
         )
         return company.project_inherit_assignments
 
     @api.model
     def _default_limit_role_to_assignments(self):
         company = self.env["res.company"].browse(
-            self._context.get("company_id", self.env.user.company_id.id)
+            self._context.get("company_id", self.env.company.id)
         )
         return company.project_limit_role_to_assignments
 
diff --git a/project_role/tests/test_project_role.py b/project_role/tests/test_project_role.py
index cbab08f3..e3eb7f88 100644
--- a/project_role/tests/test_project_role.py
+++ b/project_role/tests/test_project_role.py
@@ -22,7 +22,7 @@ def setUp(self):
         self.Project = self.env["project.project"]
         self.Role = self.env["project.role"]
         self.Assignment = self.env["project.assignment"]
-        self.company_id = self.env.user.company_id
+        self.company_id = self.env.company
 
     def test_create_assignment(self):
         user = self.ResUsers.sudo().create(
diff --git a/project_role/views/project_assignment.xml b/project_role/views/project_assignment.xml
index 48301e3a..4d58448c 100644
--- a/project_role/views/project_assignment.xml
+++ b/project_role/views/project_assignment.xml
@@ -85,7 +85,7 @@
                             <div class="row">
                                 <div class="col-2">
                                     <img
-                                        t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)"
+                                        t-att-src="kanban_image('res.users', 'avatar_128', record.user_id.raw_value)"
                                         t-att-title="record.user_id.value"
                                         t-att-alt="record.user_id.value"
                                         width="40"