diff --git a/payment.py b/payment.py
index 79cc389dfc..cb968d397e 100644
--- a/payment.py
+++ b/payment.py
@@ -62,8 +62,13 @@ INITIATOR_IDS = [
 
 class Journal(metaclass=PoolMeta):
     __name__ = 'account.payment.journal'
-    company_party = fields.Function(fields.Many2One('party.party',
-            'Company Party'), 'on_change_with_company_party')
+    company_party = fields.Function(fields.Many2One(
+            'party.party', "Company Party",
+            context={
+                'company': Eval('company', -1),
+                },
+            depends=['company']),
+        'on_change_with_company_party')
     sepa_bank_account_number = fields.Many2One('bank.account.number',
         'Bank Account Number', states={
             'required': Eval('process_method') == 'sepa',
@@ -409,7 +414,10 @@ class Mandate(Workflow, ModelSQL, ModelView):
             'readonly': Eval('state').in_(
                 ['requested', 'validated', 'cancelled']),
             },
-        depends=['state'])
+        context={
+            'company': Eval('company', -1),
+            },
+        depends=['state', 'company'])
     account_number = fields.Many2One('bank.account.number', 'Account Number',
         ondelete='RESTRICT',
         states={
diff --git a/tests/test_account_payment_sepa.py b/tests/test_account_payment_sepa.py
index ffe860802c..6c6ea0c5ab 100644
--- a/tests/test_account_payment_sepa.py
+++ b/tests/test_account_payment_sepa.py
@@ -15,7 +15,8 @@ from trytond.modules.account_payment_sepa.payment import CAMT054
 from trytond.pool import Pool
 
 from trytond.modules.currency.tests import create_currency
-from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.company.tests import (
+    create_company, set_company, CompanyMultiValueTestMixin)
 from trytond.modules.account.tests import create_chart
 
 
@@ -147,7 +148,7 @@ def validate_file(flavor, kind, xsd=None):
         schema.assertValid(sepa_xml)
 
 
-class AccountPaymentSepaTestCase(ModuleTestCase):
+class AccountPaymentSepaTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
     'Test Account Payment SEPA module'
     module = 'account_payment_sepa'