diff --git a/modules/account_payment_sepa/template/base.003.xml b/modules/account_payment_sepa/template/base.003.xml
index 53a55e1964..2ee63278f2 100644
--- a/modules/account_payment_sepa/template/base.003.xml
+++ b/modules/account_payment_sepa/template/base.003.xml
@@ -49,8 +49,11 @@ 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', ' '.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:if test="address.street">
+            <py:for each="line in address.street.splitlines()[1:8]">
+                <AdrLine py:if="address.street">${normalize('NFKD', line).encode('ascii', 'replace')[:70]}</AdrLine>
+            </py:for>
+        </py:if>
     </py:def>
     <py:def function="Account(account_number, with_ccy=True)">
         <Id>
diff --git a/modules/account_payment_sepa/template/base.xml b/modules/account_payment_sepa/template/base.xml
index 09bbc17c8a..1f09536ed8 100644
--- a/modules/account_payment_sepa/template/base.xml
+++ b/modules/account_payment_sepa/template/base.xml
@@ -48,13 +48,17 @@ this repository contains the full copyright notices and license terms. -->
         <!-- AdrTp -->
         <!-- Dept -->
         <!-- SubDept -->
-        <StrtNm py:if="address.street">${address.street[:70]}</StrtNm>
+        <StrtNm py:if="address.street">${address.street.splitlines()[0:1][:70]}</StrtNm>
         <!-- BldgNb -->
         <PstCd py:if="address.postal_code">${address.postal_code[:16]}</PstCd>
         <TwnNm py:if="address.city">${address.city[:35]}</TwnNm>
         <CtrySubDvsn py:if="address.subdivision">${address.subdivision.rec_name[:35]}</CtrySubDvsn>
         <Ctry py:if="address.country">${address.country.code}</Ctry>
-        <!-- AdrLine -->
+        <py:if test="address.street">
+            <py:for each="line in address.street.splitlines()[1:8]">
+                <AdrLine py:if="line">${line[:70]}</AdrLine>
+            </py:for>
+        </py:if>
     </py:def>
     <py:def function="Account(account_number, currency=True)">
         <Id>