diff --git a/modules/edocument_ubl/template/2/base.xml b/modules/edocument_ubl/template/2/base.xml
index 4b2d4502b5..bb14b39e8c 100644
--- a/modules/edocument_ubl/template/2/base.xml
+++ b/modules/edocument_ubl/template/2/base.xml
@@ -45,11 +45,15 @@ this repository contains the full copyright notices and license terms. -->
             <py:when test="(specification or '').startswith('peppol')">
                 <py:with vars="streets = (address.street or '').splitlines()">
                     <cbc:StreetName py:if="len(streets) >= 1">${streets[0]}</cbc:StreetName>
-                    <cbc:AdditionalStreetName py:if="len(streets) >= 2">${street[1]}</cbc:AdditionalStreetName>
+                    <cbc:AdditionalStreetName py:if="len(streets) >= 2">${streets[1]}</cbc:AdditionalStreetName>
                     <cbc:CityName py:if="address.city">${address.city}</cbc:CityName>
                     <cbc:PostalZone py:if="address.postal_code">${address.postal_code}</cbc:PostalZone>
                     <cbc:CountrySubentity py:if="address.subdivision">${address.subdivision.name}</cbc:CountrySubentity>
-                    <cbc:AddressLine py:if="len(streets) >= 3">${streets[2]}</cbc:AddressLine>
+                    <cac:AddressLine py:if="len(streets) >= 3">
+                        <cbc:Line>
+                            ${streets[2]}
+                        </cbc:Line>
+                    </cac:AddressLine>
                 </py:with>
             </py:when>
             <py:otherwise>
diff --git a/modules/edocument_ubl/tests/test_module.py b/modules/edocument_ubl/tests/test_module.py
index 53139cbbcf..5bbf7fcc3f 100644
--- a/modules/edocument_ubl/tests/test_module.py
+++ b/modules/edocument_ubl/tests/test_module.py
@@ -31,7 +31,7 @@ def get_invoice():
 
     address = Mock(spec=Address,
         street_unstructured="St sample, 15",
-        street="St sample, 15",
+        street="St sample, 15\n2nd floor\nBox 1234\n",
         city="Scranton",
         postal_code="1000",
         subdivision=None,