diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 5edd58c0..a81dcdcb 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -362,6 +362,14 @@ func (p *Pages) CompleteSignup(w io.Writer) error {
 	return p.executeLogin("user/completeSignup", w, nil)
 }
 
+type SignupSuccessParams struct {
+	Handle string
+}
+
+func (p *Pages) SignupSuccess(w io.Writer, params SignupSuccessParams) error {
+	return p.executePlain("user/fragments/signupSuccess", w, params)
+}
+
 type TermsOfServiceParams struct {
 	BaseParams
 	Content template.HTML
diff --git a/appview/pages/templates/user/fragments/signupSuccess.html b/appview/pages/templates/user/fragments/signupSuccess.html
new file mode 100644
index 00000000..375ea4c7
--- /dev/null
+++ b/appview/pages/templates/user/fragments/signupSuccess.html
@@ -0,0 +1,18 @@
+{{ define "user/fragments/signupSuccess" }}
+  <main
+      id="main"
+      hx-swap-oob="outerHTML"
+      class="w-full max-w-md px-7 mt-4 flex flex-col items-center gap-4 text-center"
+  >
+    <div class="flex items-center justify-center size-16 rounded-full bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400">
+      {{ i "check" "size-8" }}
+    </div>
+    <p class="text-lg dark:text-white">Account created successfully</p>
+    <a
+        href="/login?handle={{ .Handle }}"
+        class="btn-create w-full text-base hover:no-underline hover:text-white inline-flex items-center justify-center gap-1"
+    >
+      Continue to login {{ i "arrow-right" "size-4" }}
+    </a>
+  </main>
+{{ end }}
diff --git a/appview/signup/signup.go b/appview/signup/signup.go
index 2731ce0c..87a350be 100644
--- a/appview/signup/signup.go
+++ b/appview/signup/signup.go
@@ -332,13 +332,7 @@ func (s *Signup) executeSignupTransaction(ctx context.Context, username, passwor
 	// if we get here, we've successfully created the account and added the email
 	success = true
 
-	s.pages.NoticeHTMLWithClears(w, "signup-msg", fmt.Sprintf(`
-		<div class="w-full h-fit mt-4 p-4 bg-green-50 dark:bg-green-300 border border-green-200 dark:border-green-400 text-green-800 dark:text-green-900 rounded">
-    		Account created successfully.
-    		<br/>
-    		You can now <a class="dark:text-black hover:dark:text-black underline" href="/login">login</a> with <code>%s.tngl.sh</code>.
-    	</div>
-	`, username), "signup-error")
+	s.pages.SignupSuccess(w, pages.SignupSuccessParams{Handle: autoClaimDomain})
 
 	// clean up inflight signup asynchronously
 	go func() {