diff --git a/company.py b/company.py
index a127a7fe05..7de13a4203 100644
--- a/company.py
+++ b/company.py
@@ -134,6 +134,9 @@ class CompanyConfig(Wizard):
                 })
         return 'end'
 
+    def end(self):
+        return 'reload context'
+
 
 class CompanyReport(Report):
 
diff --git a/res.py b/res.py
index 73d554e206..3ace2ad05e 100644
--- a/res.py
+++ b/res.py
@@ -114,12 +114,6 @@ class User(metaclass=PoolMeta):
                 res['main_company'] = user.main_company.id
                 res['main_company.rec_name'] = user.main_company.rec_name
             res['employees'] = [e.id for e in user.employees]
-        if user.employee:
-            res['employee'] = user.employee.id
-            res['employee.rec_name'] = user.employee.rec_name
-        if user.company:
-            res['company'] = user.company.id
-            res['company.rec_name'] = user.company.rec_name
         return res
 
     @classmethod