diff --git a/account_banking_pain_base/company.py b/account_banking_pain_base/company.py
index cccafb7a8..94864d548 100644
--- a/account_banking_pain_base/company.py
+++ b/account_banking_pain_base/company.py
@@ -45,10 +45,12 @@ class res_company(orm.Model):
         company = self.browse(cr, uid, company_id, context=context)
         company_vat = company.vat
         party_identifier = False
-        if company_vat and company_vat[0:2].upper() in ['BE']:
-            party_identifier = company_vat[2:].replace(' ', '')
-        if company_vat and company_vat[0:2].upper() in ['ES']:
-            party_identifier = company.sepa_creditor_identifier
+        if company_vat:
+            country_code = company_vat[0:2].upper()
+            if country_code == 'BE':
+                party_identifier = company_vat[2:].replace(' ', '')
+            elif country_code == 'ES':
+               party_identifier = company.sepa_creditor_identifier
         return party_identifier
 
     def _initiating_party_issuer_default(self, cr, uid, context=None):