diff --git a/modules/account_payment_sepa/template/base.xml b/modules/account_payment_sepa/template/base.xml
index 1f09536ed8..ea9b30bbf7 100644
--- a/modules/account_payment_sepa/template/base.xml
+++ b/modules/account_payment_sepa/template/base.xml
@@ -48,14 +48,14 @@ this repository contains the full copyright notices and license terms. -->
         <!-- AdrTp -->
         <!-- Dept -->
         <!-- SubDept -->
-        <StrtNm py:if="address.street">${address.street.splitlines()[0:1][:70]}</StrtNm>
-        <!-- BldgNb -->
+        <StrtNm py:if="address.street_name">${address.street_name[:70]}</StrtNm>
+        <BldgNb py:if="address.building_number">${address.building_number[:16]}</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>
-        <py:if test="address.street">
-            <py:for each="line in address.street.splitlines()[1:8]">
+        <py:if test="address.street_unstructured">
+            <py:for each="line in address.street_unstructured.splitlines()[1:8]">
                 <AdrLine py:if="line">${line[:70]}</AdrLine>
             </py:for>
         </py:if>