diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html
index 4ac9297b..b9533c57 100644
--- a/appview/pages/templates/user/login.html
+++ b/appview/pages/templates/user/login.html
@@ -22,10 +22,13 @@
               <button
                   type="button"
                   hx-post="/account/switch"
-                  hx-vals='{"did": "{{ .Did }}"}'
+                  hx-include="this"
                   hx-swap="none"
                   class="flex items-center gap-2 flex-1 text-left min-w-0"
               >
+                  {{ $returnUrl := (or $.ReturnUrl "/") }}
+                  <input type="hidden" name="did" value="{{ .Did }}">
+                  <input type="hidden" name="return_url" value="{{ $returnUrl }}">
                   {{ template "user/fragments/pic" (list .Did "size-8") }}
                   <div class="flex flex-col min-w-0">
                       <span class="text-sm font-medium dark:text-white truncate">{{ .Did | resolve | truncateAt30 }}</span>
diff --git a/appview/state/accounts.go b/appview/state/accounts.go
index 579b9dda..92db7927 100644
--- a/appview/state/accounts.go
+++ b/appview/state/accounts.go
@@ -34,7 +34,11 @@ func (s *State) SwitchAccount(w http.ResponseWriter, r *http.Request) {
 	}
 
 	l.Info("switched account", "did", did)
-	s.pages.HxRefresh(w)
+	if returnUrl := r.FormValue("return_url"); returnUrl != "" {
+		s.pages.HxRedirect(w, returnUrl)
+	} else {
+		s.pages.HxRefresh(w)
+	}
 }
 
 func (s *State) RemoveAccount(w http.ResponseWriter, r *http.Request) {