diff --git a/grab.html b/grab.html
index 5c4da76..5c17ed6 100644
--- a/grab.html
+++ b/grab.html
@@ -37,7 +37,7 @@
       <div class="title">Success!</div>
       <div class="card">
         <div class="description">
-          <b>username@domain.com</b> is your new Lightning Address!
+          <b>{{ name }}@{{ domain }}</b> is your new Lightning Address!
         </div>
         <div class="bold-small">
           In order to edit the configuration of this address in the future you
diff --git a/main.go b/main.go
index ca5ce13..d34c995 100644
--- a/main.go
+++ b/main.go
@@ -66,7 +66,9 @@ func main() {
 
 	router.Path("/grab").HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			pin, inv, err := SaveName(r.FormValue("name"), &Params{
+			name := r.FormValue("name")
+
+			pin, inv, err := SaveName(name, &Params{
 				Kind: r.FormValue("kind"),
 				Host: r.FormValue("host"),
 				Key:  r.FormValue("key"),
@@ -82,7 +84,8 @@ func main() {
 			renderHTML(w, grabHTML, struct {
 				PIN     string `json:"pin"`
 				Invoice string `json:"invoice"`
-			}{pin, inv})
+				Name    string `json:"name"`
+			}{pin, inv, name})
 		},
 	)