Stay on guild self service page after logging in

src/web/pug/guild_not_linked.pug

@@ -18,8 +18,10 @@ block body
     div
       != icons.Icons.IconInfo
     div
+      - const self = `@${reg.sender_localpart}:${reg.ooye.server_name}`
       strong You picked self-service mode
       .mt4 To complete setup, you need to manually choose a Matrix space to link with #[strong= guild.name].
+      .mt4 On Matrix, invite #[code.s-code-block: a.fc-black.s-link(href=`https://matrix.to/#/${self}` target="_blank")= self] to a space. Then you can pick the space on this page.
 
   h3.mt32.fs-category Choose a space
 
@@ -33,13 +35,12 @@ block body
       else
         if session.data.mxid
           tr
-            - const self = `@${reg.sender_localpart}:${reg.ooye.server_name}`
-            td.p16 On Matrix, invite #[code.s-code-block: a.s-link(href=`https://matrix.to/#/${self}` target="_blank")= self] to a space. Then you can pick it from this list.
+            td.p16 Invite the bridge to a space, and the space will show up here.
         else
           tr
             td.d-flex.ai-center.pl16.g16
               | You need to log in with Matrix first.
-              a.s-btn.s-btn__matrix.s-btn__outlined(href=rel("/log-in-with-matrix")) Log in with Matrix
+              a.s-btn.s-btn__matrix.s-btn__outlined(href=rel(`/log-in-with-matrix`, {next: `./guild?guild_id=${guild_id}`})) Log in with Matrix
 
   h3.mt48.fs-category Auto-create
   .s-card

src/web/pug/log-in-with-matrix.pug

@@ -7,6 +7,8 @@ block body
   .d-flex.g16#form-container
     .fl-grow1
       form.d-flex.gy16.fd-column(method="post" action="/api/log-in-with-matrix" hx-post="/api/log-in-with-matrix" hx-indicator="#log-in-button" hx-select="#ok" hx-target="#form-container")
+        if next
+          input(type="hidden" name="next" value=next)
         .d-flex.gy4.fd-column
           label.s-label(for="mxid") Your Matrix ID
           input.fl-grow1.s-input.wmx3#mxid(name="mxid" required placeholder="@user:example.org")