diff --git a/cmd/qrbill-api/api.go b/cmd/qrbill-api/api.go
index 44a28ca..8179fce 100644
--- a/cmd/qrbill-api/api.go
+++ b/cmd/qrbill-api/api.go
@@ -59,12 +59,12 @@ func qrchFromRequest(r *http.Request) *qrbill.QRCH {
 			Ccy: "CHF",
 		},
 		UltmtDbtr: qrbill.Address{
-			AdrTp:            qrbill.AddressType(ifEmpty(r.Form, "udaddrtype", string(qrbill.AddressTypeCombined))),
+			AdrTp:            qrbill.AddressType(ifEmpty(r.Form, "udaddrtype", string(qrbill.AddressTypeStructured))),
 			Name:             ifEmpty(r.Form, "udname", "Michael Stapelberg"),
-			StrtNmOrAdrLine1: ifEmpty(r.Form, "udaddr1", "Stauffacherstr 42"),
-			BldgNbOrAdrLine2: ifEmpty(r.Form, "udaddr2", "8004 Zürich"),
-			PstCd:            ifEmpty(r.Form, "udpost", ""),
-			TwnNm:            ifEmpty(r.Form, "udcity", ""),
+			StrtNmOrAdrLine1: ifEmpty(r.Form, "udaddr1", "Stauffacherstr"),
+			BldgNbOrAdrLine2: ifEmpty(r.Form, "udaddr2", "42"),
+			PstCd:            ifEmpty(r.Form, "udpost", "8004"),
+			TwnNm:            ifEmpty(r.Form, "udcity", "Zürich"),
 			Ctry:             ifEmpty(r.Form, "udcountry", "CH"),
 		},
 		RmtInf: qrbill.QRCHRmtInf{
diff --git a/qrbill_test.go b/qrbill_test.go
index 13d81d1..db9381e 100644
--- a/qrbill_test.go
+++ b/qrbill_test.go
@@ -84,10 +84,12 @@ func TestAmountValidation(t *testing.T) {
 				CdtrInf: qrbill.QRCHCdtrInf{
 					IBAN: "CH0209000000870913543",
 					Cdtr: qrbill.Address{
-						AdrTp:            qrbill.AddressTypeCombined,
+						AdrTp:            qrbill.AddressTypeStructured,
 						Name:             "Legalize it",
-						StrtNmOrAdrLine1: "Quellenstrasse 25",
-						BldgNbOrAdrLine2: "8005 Zürich",
+						StrtNmOrAdrLine1: "Quellenstrasse",
+						BldgNbOrAdrLine2: "25",
+						PstCd:            "8005",
+						TwnNm:            "Zürich",
 						Ctry:             "CH",
 					},
 				},
@@ -96,10 +98,12 @@ func TestAmountValidation(t *testing.T) {
 					Ccy: "CHF",
 				},
 				UltmtDbtr: qrbill.Address{
-					AdrTp:            qrbill.AddressTypeCombined,
+					AdrTp:            qrbill.AddressTypeStructured,
 					Name:             "Michael Stapelberg",
-					StrtNmOrAdrLine1: "Stauffacherstr 42",
-					BldgNbOrAdrLine2: "8004 Zürich",
+					StrtNmOrAdrLine1: "Stauffacherstr",
+					BldgNbOrAdrLine2: "42",
+					PstCd:            "8004",
+					TwnNm:            "Zürich",
 					Ctry:             "CH",
 				},
 				RmtInf: qrbill.QRCHRmtInf{