diff --git a/docs/swarm/ui.md b/docs/swarm/ui.md
index 83c75584..3ee7479b 100644
--- a/docs/swarm/ui.md
+++ b/docs/swarm/ui.md
@@ -443,6 +443,9 @@ account of that agent as names and hosts and never a credential.
 | forgejo | `swarm/agents/<agent>/forge/<label>`        | the label   | its `url`                |
 | github  | `swarm/agents/<agent>/github-token`, if any | `github`    | `github.com`             |
 
+The route names the second kind `forgejo`; the panel shows it as **forge**,
+the word the link menu uses.
+
 The matrix `main` row is the agent's own account, which the swarm mints;
 it carries an **own account** badge. The panel requests the list again when
 a link dialog closes.
diff --git a/frontend/packages/swarm-ui/src/agent/detail/LinkedAccounts.tsx b/frontend/packages/swarm-ui/src/agent/detail/LinkedAccounts.tsx
index b645509b..daa3eed7 100644
--- a/frontend/packages/swarm-ui/src/agent/detail/LinkedAccounts.tsx
+++ b/frontend/packages/swarm-ui/src/agent/detail/LinkedAccounts.tsx
@@ -14,6 +14,7 @@ import { ApiErrorPanel } from "@hive/shared/api-error-panel.js";
 import { readApiError, type ProblemDetails } from "@hive/shared/api-error.js";
 import { Badge } from "@hive/shared/badge.js";
 import { ConfirmDialog } from "../../ui/confirm-dialog/ConfirmDialog.js";
+import { accountKindLabel } from "./account-kind.js";
 import "./LinkedAccounts.css";
 
 type AccountKind = "matrix" | "forgejo" | "github";
@@ -123,7 +124,7 @@ export function LinkedAccounts({
       {deleteTarget ? (
         <>
           <p>
-            Delete the {deleteTarget.kind} account{" "}
+            Delete the {accountKindLabel(deleteTarget.kind)} account{" "}
             <strong>{deleteTarget.name}</strong>
             {deleteTarget.host ? (
               <>
@@ -173,7 +174,7 @@ export function LinkedAccounts({
       <ul class="ui-linked-accounts">
         {accounts.map((a) => (
           <li key={`${a.kind}/${a.name}`}>
-            <Badge label={a.kind} value={a.name} />
+            <Badge label={accountKindLabel(a.kind)} value={a.name} />
             <span class="ui-linked-accounts-host">{a.host ?? "—"}</span>
             {a.reserved ? (
               <Badge
@@ -184,7 +185,7 @@ export function LinkedAccounts({
               <Badge
                 variant="quiet"
                 value="delete"
-                title={`delete the ${a.kind} account ${a.name}`}
+                title={`delete the ${accountKindLabel(a.kind)} account ${a.name}`}
                 onClick={() => openDelete(a)}
               />
             )}
diff --git a/frontend/packages/swarm-ui/src/agent/detail/account-kind.ts b/frontend/packages/swarm-ui/src/agent/detail/account-kind.ts
new file mode 100644
index 00000000..97b41da2
--- /dev/null
+++ b/frontend/packages/swarm-ui/src/agent/detail/account-kind.ts
@@ -0,0 +1,6 @@
+// What the operator calls an account kind. The wire value for a forge
+// account is "forgejo", but the link menu and form say "forge", so the list
+// and the delete dialog say it too.
+export function accountKindLabel(kind: string): string {
+  return kind === "forgejo" ? "forge" : kind;
+}
diff --git a/frontend/packages/swarm-ui/src/pages/LinkForgeAccountForm.tsx b/frontend/packages/swarm-ui/src/pages/LinkForgeAccountForm.tsx
index 71d6e37a..2389e92f 100644
--- a/frontend/packages/swarm-ui/src/pages/LinkForgeAccountForm.tsx
+++ b/frontend/packages/swarm-ui/src/pages/LinkForgeAccountForm.tsx
@@ -22,7 +22,7 @@ const LABEL_PATTERN = "[a-z0-9\\-]{1,63}";
 type SubmitState =
   | { status: "idle" }
   | { status: "submitting" }
-  | { status: "done"; url: string }
+  | { status: "done"; label: string; url: string }
   | { status: "error"; problem: ProblemDetails };
 
 export function LinkForgeAccountForm({
@@ -56,7 +56,9 @@ export function LinkForgeAccountForm({
         return;
       }
       const body = (await r.json().catch(() => ({}))) as { url?: string };
-      setResult({ status: "done", url: body.url ?? url.trim() });
+      // The label is stored with the result, so the success message reads
+      // against what was sent even if the field is edited afterwards.
+      setResult({ status: "done", label, url: body.url ?? url.trim() });
       // The store holds the token now; nothing here needs it.
       setToken("");
     } catch (err) {
@@ -114,7 +116,7 @@ export function LinkForgeAccountForm({
       </form>
       {result.status === "done" && (
         <p class="link-matrix-account-result-ok">
-          linked <strong>{label}</strong> ({result.url}) to{" "}
+          linked <strong>{result.label}</strong> ({result.url}) to{" "}
           <strong>{agent}</strong>
         </p>
       )}
diff --git a/frontend/packages/swarm-ui/src/pages/LinkMatrixAccountForm.tsx b/frontend/packages/swarm-ui/src/pages/LinkMatrixAccountForm.tsx
index dbdc3584..1524daef 100644
--- a/frontend/packages/swarm-ui/src/pages/LinkMatrixAccountForm.tsx
+++ b/frontend/packages/swarm-ui/src/pages/LinkMatrixAccountForm.tsx
@@ -51,7 +51,7 @@ type SubmitState =
   // login response) and `undefined` in token mode — see
   // `PutMatrixAccountResponse`'s own doc for why token mode doesn't
   // spend a round trip resolving one.
-  | { status: "done"; userId?: string }
+  | { status: "done"; account: string; userId?: string }
   | { status: "error"; problem: ProblemDetails };
 
 const MODE_OPTIONS = [
@@ -79,6 +79,14 @@ export function LinkMatrixAccountForm({
   const [homeserver, setHomeserver] = useState("");
   const [result, setResult] = useState<SubmitState>({ status: "idle" });
 
+  // A secret lives in state only while it is being typed and sent: it is
+  // dropped when the request ends, whether it worked or not, and when the
+  // credential mode changes.
+  function clearSecrets() {
+    setToken("");
+    setPassword("");
+  }
+
   async function submit(e: Event) {
     e.preventDefault();
     setResult({ status: "submitting" });
@@ -109,6 +117,7 @@ export function LinkMatrixAccountForm({
           ),
         },
       );
+      clearSecrets();
       if (!r.ok) {
         setResult({ status: "error", problem: await readApiError(r) });
         return;
@@ -116,16 +125,11 @@ export function LinkMatrixAccountForm({
       const body = (await r.json().catch(() => ({}))) as {
         user_id?: string;
       };
-      setResult({ status: "done", userId: body.user_id });
-      // Secrets cleared on success — nothing left needing them in the
-      // form once the store holds the derived credential, and a secret
-      // sitting in a field after the action that used it is exactly the
-      // kind of stale-credential risk the whole store exists to avoid.
-      // Account name kept, so the success message below reads against
-      // what actually landed.
-      setToken("");
-      setPassword("");
+      // The account name is stored with the result, so the success message
+      // reads against what was sent even if the field is edited afterwards.
+      setResult({ status: "done", account, userId: body.user_id });
     } catch (err) {
+      clearSecrets();
       setResult({ status: "error", problem: { detail: String(err) } });
     }
   }
@@ -163,7 +167,10 @@ export function LinkMatrixAccountForm({
           label="credential"
           value={mode}
           options={MODE_OPTIONS}
-          onChange={(v) => setMode(v as Mode)}
+          onChange={(v) => {
+            clearSecrets();
+            setMode(v as Mode);
+          }}
         />
         {mode === "token" ? (
           <TextField
@@ -218,7 +225,7 @@ export function LinkMatrixAccountForm({
       </form>
       {result.status === "done" && (
         <p class="link-matrix-account-result-ok">
-          linked <strong>{account}</strong> to <strong>{agent}</strong>
+          linked <strong>{result.account}</strong> to <strong>{agent}</strong>
           {result.userId ? (
             <>
               {" "}
diff --git a/frontend/packages/swarm-ui/test/account-kind.test.mjs b/frontend/packages/swarm-ui/test/account-kind.test.mjs
new file mode 100644
index 00000000..833f61f0
--- /dev/null
+++ b/frontend/packages/swarm-ui/test/account-kind.test.mjs
@@ -0,0 +1,15 @@
+// The word the linked-accounts list uses for an account kind. Run by `npm
+// test`, which Node runs with its built-in test runner and type stripping,
+// so the `.ts` module is imported as it is.
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { accountKindLabel } from "../src/agent/detail/account-kind.ts";
+
+test("a forgejo account is called a forge account, like the link menu does", () => {
+  assert.equal(accountKindLabel("forgejo"), "forge");
+});
+
+test("the other kinds keep their names", () => {
+  assert.equal(accountKindLabel("matrix"), "matrix");
+  assert.equal(accountKindLabel("github"), "github");
+});