diff --git a/db.go b/db.go
index 064c1a1..5b37025 100644
--- a/db.go
+++ b/db.go
@@ -40,8 +40,10 @@ func SaveName(
 		}
 	}
 
+	params.Name = name
+
 	// check if the given data works
-	if inv, err = makeInvoice(params, 1000); err != nil {
+	if inv, err = makeInvoice(params, 1000, &pin); err != nil {
 		return "", "", fmt.Errorf("couldn't make an invoice with the given data: %w", err)
 	}
 
diff --git a/index.html b/index.html
index 616513a..ed4c865 100644
--- a/index.html
+++ b/index.html
@@ -58,6 +58,7 @@
           <div class="field">
             <label for="kind"> Node Backend Type </label>
             <select name="kind" id="kind" id="kind" v-model="kind">
+              <option disabled value="">Please select one:</option>
               <option value="lnd">LND</option>
               <option value="sparko">Sparko</option>
               <option value="lnpay">LNPay</option>
@@ -136,6 +137,10 @@
             isNew: true,
             ...initial
           }
+        },
+
+        mounted() {
+          this.kind = ''
         }
       }
 
diff --git a/lnurl.go b/lnurl.go
index 8d24d17..4428a18 100644
--- a/lnurl.go
+++ b/lnurl.go
@@ -45,7 +45,7 @@ func handleLNURL(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		bolt11, err := makeInvoice(params, msat)
+		bolt11, err := makeInvoice(params, msat, nil)
 		if err != nil {
 			json.NewEncoder(w).Encode(
 				lnurl.ErrorResponse("failed to create invoice: " + err.Error()))
diff --git a/makeinvoice.go b/makeinvoice.go
index 6801f1b..f78b5df 100644
--- a/makeinvoice.go
+++ b/makeinvoice.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"crypto/sha256"
-	"encoding/hex"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -22,10 +22,11 @@ func makeMetadata(params *Params) string {
 	return metadata
 }
 
-func makeInvoice(params *Params, msat int) (bolt11 string, err error) {
-	// description_hash
-	h := sha256.Sum256([]byte(makeMetadata(params)))
-
+func makeInvoice(
+	params *Params,
+	msat int,
+	pin *string,
+) (bolt11 string, err error) {
 	// prepare params
 	var backend makeinvoice.BackendParams
 	switch params.Kind {
@@ -51,17 +52,29 @@ func makeInvoice(params *Params, msat int) (bolt11 string, err error) {
 		}
 	}
 
-	log.Debug().Int("msatoshi", msat).
-		Interface("backend", backend).
-		Str("description_hash", hex.EncodeToString(h[:])).
-		Msg("generating invoice")
-
-	// actually generate the invoice
-	return makeinvoice.MakeInvoice(makeinvoice.Params{
-		Msatoshi:        int64(msat),
-		DescriptionHash: h[:],
-		Backend:         backend,
+	mip := makeinvoice.Params{
+		Msatoshi: int64(msat),
+		Backend:  backend,
 
 		Label: s.Domain + "/" + strconv.FormatInt(time.Now().Unix(), 16),
-	})
+	}
+
+	if pin != nil {
+		// use this as the description
+		mip.Description = fmt.Sprintf("%s's PIN for '%s@%s' lightning address: %s", s.Domain, params.Name, s.Domain, *pin)
+	} else {
+		// make the lnurlpay description_hash
+		h := sha256.Sum256([]byte(makeMetadata(params)))
+		mip.DescriptionHash = h[:]
+	}
+
+	// actually generate the invoice
+	bolt11, err = makeinvoice.MakeInvoice(mip)
+
+	log.Debug().Int("msatoshi", msat).
+		Interface("backend", backend).
+		Str("bolt11", bolt11).Err(err).
+		Msg("invoice generation")
+
+	return bolt11, err
 }
diff --git a/static/style.css b/static/style.css
index 7695e4a..cb1c694 100644
--- a/static/style.css
+++ b/static/style.css
@@ -8,6 +8,10 @@ body {
   padding: 60px 20px 40px 20px;
 }
 
+.hidden {
+  display: none;
+}
+
 .title {
   font-size: 40px;
   font-weight: 700;