diff --git a/cmd/qrbill-api/api.go b/cmd/qrbill-api/api.go
index 2efd77a..5ea0371 100644
--- a/cmd/qrbill-api/api.go
+++ b/cmd/qrbill-api/api.go
@@ -60,7 +60,7 @@ func qrchFromRequest(r *http.Request) *qrbill.QRCH {
 			Ccy: "CHF",
 		},
 		UltmtDbtr: qrbill.Address{
-			AdrTp:            qrbill.AddressTypeCombined,
+			AdrTp:            qrbill.AddressType(ifEmpty(r.Form, "udaddrtype", qrbill.AddressTypeCombined)),
 			Name:             ifEmpty(r.Form, "udname", "Michael Stapelberg"),
 			StrtNmOrAdrLine1: ifEmpty(r.Form, "udaddr1", "Stauffacherstr 42"),
 			BldgNbOrAdrLine2: ifEmpty(r.Form, "udaddr2", "8004 Zürich"),
diff --git a/cmd/qrbill-api/debughtml.go b/cmd/qrbill-api/debughtml.go
index b31990a..2955b40 100644
--- a/cmd/qrbill-api/debughtml.go
+++ b/cmd/qrbill-api/debughtml.go
@@ -136,6 +136,11 @@ th { text-align: left; }
   <td>{{ .Message }}</td>
 </tr>
 
+<tr>
+  <td>&udaddrtype=</td>
+  <td>{{ .Udaddrtype }}</td>
+</tr>
+
 </table>
 
 </div>
@@ -154,12 +159,13 @@ func debugHTML(w http.ResponseWriter, r *http.Request, prefix string, qrch *qrbi
 		Crcity    string
 		Crcountry string
 
-		Udname    string
-		Udaddr1   string
-		Udaddr2   string
-		Udpost    string
-		Udcity    string
-		Udcountry string
+		Udname     string
+		Udaddr1    string
+		Udaddr2    string
+		Udpost     string
+		Udcity     string
+		Udcountry  string
+		Udaddrtype string
 
 		Message string
 
@@ -174,12 +180,13 @@ func debugHTML(w http.ResponseWriter, r *http.Request, prefix string, qrch *qrbi
 		Crcity:    r.FormValue("crcity"),
 		Crcountry: r.FormValue("crcountry"),
 
-		Udname:    r.FormValue("udname"),
-		Udaddr1:   r.FormValue("udaddr1"),
-		Udaddr2:   r.FormValue("udaddr2"),
-		Udpost:    r.FormValue("udpost"),
-		Udcity:    r.FormValue("udcity"),
-		Udcountry: r.FormValue("udcountry"),
+		Udname:     r.FormValue("udname"),
+		Udaddr1:    r.FormValue("udaddr1"),
+		Udaddr2:    r.FormValue("udaddr2"),
+		Udpost:     r.FormValue("udpost"),
+		Udcity:     r.FormValue("udcity"),
+		Udcountry:  r.FormValue("udcountry"),
+		Udaddrtype: r.FormValue("udaddrtype"),
 
 		Message: r.FormValue("message"),