diff --git a/company.py b/company.py
index 0cfcaedebc..4df7fcf134 100644
--- a/company.py
+++ b/company.py
@@ -353,11 +353,10 @@ class CompanyConfig(Wizard):
 class CompanyReport(Report):
 
     @classmethod
-    def parse(cls, report, records, data, localcontext):
-        user = Pool().get('res.user')(Transaction().user)
-        localcontext['company'] = user.company
-        return super(CompanyReport, cls).parse(report, records, data,
-            localcontext)
+    def get_context(cls, records, data):
+        report_context = super(CompanyReport, cls).get_context(records, data)
+        report_context['company'] = report_context['user'].company
+        return report_context
 
 
 class LetterReport(CompanyReport):
diff --git a/letter.odt b/letter.odt
index 17ce07d9d5..243368d6c3 100644
Binary files a/letter.odt and b/letter.odt differ
diff --git a/tests/test_company.py b/tests/test_company.py
index 2ed6120c7b..c567b33f08 100644
--- a/tests/test_company.py
+++ b/tests/test_company.py
@@ -40,6 +40,7 @@ class CompanyTestCase(unittest.TestCase):
 
             party1, = self.party.create([{
                         'name': 'Dunder Mifflin',
+                        'addresses': [('create', [{}])],
                         }])
             company1, = self.company.create([{
                         'party': party1.id,