diff --git a/mandate.odt b/mandate.odt
index 7fea352b20..edabaccb85 100644
Binary files a/mandate.odt and b/mandate.odt differ
diff --git a/template/base.003.xml b/template/base.003.xml
index 39555e0587..c6c4d3b917 100644
--- a/template/base.003.xml
+++ b/template/base.003.xml
@@ -29,8 +29,8 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <py:def function="PostalAddress(address)">
         <Ctry py:if="address.country">${normalize('NFKD', address.country.code).encode('ascii', 'replace')}</Ctry>
-        <AdrLine py:if="address.street">${normalize('NFKD', address.street).encode('ascii', 'replace')[:70]}</AdrLine>
-        <AdrLine py:if="address.streetbis">${normalize('NFKD', address.streetbis).encode('ascii', 'replace')[:70]}</AdrLine>
+        <AdrLine py:if="address.street">${normalize('NFKD', ' '.join(address.street.splitlines()[0:1])).encode('ascii', 'replace')[:70]}</AdrLine>
+        <AdrLine py:if="address.street and len(address.street.splitlines()) > 1">${normalize('NFKD', ' '.join(address.street.splitlines()[1:])).encode('ascii', 'replace')[:70]}</AdrLine>
     </py:def>
     <py:def function="Account(account_number, with_ccy=True)">
         <Id>
diff --git a/tests/test_account_payment_sepa.py b/tests/test_account_payment_sepa.py
index 8a615b0de3..d669d62574 100644
--- a/tests/test_account_payment_sepa.py
+++ b/tests/test_account_payment_sepa.py
@@ -38,8 +38,7 @@ def setup_environment():
     bank = Bank(party=bank_party, bic='BICODEBBXXX')
     bank.save()
     customer = Party(name='Customer')
-    address = Address(street='street', streetbis='street bis',
-        zip='1234', city='City')
+    address = Address(street='street', zip='1234', city='City')
     customer.addresses = [address]
     customer.save()
     return {