diff --git a/clients/admin/package-lock.json b/clients/admin/package-lock.json
index 932f9456d2..d119a1ef7d 100644
--- a/clients/admin/package-lock.json
+++ b/clients/admin/package-lock.json
@@ -41,7 +41,6 @@
         "eslint-plugin-react-hooks": "^5.1.0",
         "eslint-plugin-react-refresh": "^0.4.18",
         "globals": "^15.14.0",
-        "openapi-typescript": "^7.6.1",
         "tailwindcss": "^4.0.6",
         "typescript": "^5.7.3",
         "typescript-eslint": "^8.23.0",
@@ -1811,82 +1810,6 @@
       "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
       "license": "MIT"
     },
-    "node_modules/@redocly/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js-replace": "^1.0.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@redocly/config": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.22.0.tgz",
-      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@redocly/openapi-core": {
-      "version": "1.34.12",
-      "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.12.tgz",
-      "integrity": "sha512-b32XWsz6enN6K4bx8xWsqUaXTJR/DnYT3lL1CzDYzIYKw243NNlz6fexmr71q/U4HrEcMoJGBvwAfcxOb8ymQw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "8.11.2",
-        "@redocly/config": "0.22.0",
-        "colorette": "1.4.0",
-        "https-proxy-agent": "7.0.6",
-        "js-levenshtein": "1.1.6",
-        "js-yaml": "4.1.1",
-        "minimatch": "5.1.9",
-        "pluralize": "8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=18.17.0",
-        "npm": ">=9.5.0"
-      }
-    },
-    "node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
-      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@redocly/openapi-core/node_modules/minimatch": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.27",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
@@ -2990,16 +2913,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.14.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
@@ -3017,16 +2930,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3442,13 +3345,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/change-case": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/class-variance-authority": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
@@ -3499,13 +3395,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "license": "MIT"
     },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -4634,20 +4523,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4685,19 +4560,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/index-to-position": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz",
-      "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -5112,16 +4974,6 @@
         "jiti": "lib/jiti-cli.mjs"
       }
     },
-    "node_modules/js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -5727,40 +5579,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/openapi-typescript": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.13.0.tgz",
-      "integrity": "sha512-EFP392gcqXS7ntPvbhBzbF8TyBA+baIYEm791Hy5YkjDYKTnk/Tn5OQeKm5BIZvJihpp8Zzr4hzx0Irde1LNGQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "^1.34.6",
-        "ansi-colors": "^4.1.3",
-        "change-case": "^5.4.4",
-        "parse-json": "^8.3.0",
-        "supports-color": "^10.2.2",
-        "yargs-parser": "^21.1.1"
-      },
-      "bin": {
-        "openapi-typescript": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "typescript": "^5.x"
-      }
-    },
-    "node_modules/openapi-typescript/node_modules/supports-color": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz",
-      "integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -5851,24 +5669,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parse-json": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz",
-      "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "index-to-position": "^1.1.0",
-        "type-fest": "^4.39.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -5955,16 +5755,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/pluralize": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pngjs": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
@@ -6281,16 +6071,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
@@ -6850,19 +6630,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-fest": {
-      "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
@@ -7054,13 +6821,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/uri-js-replace": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -7374,13 +7134,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml-ast-parser": {
-      "version": "0.0.43",
-      "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
     "node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -7403,16 +7156,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/yargs/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
diff --git a/clients/admin/package.json b/clients/admin/package.json
index 94035a5899..60eb36c586 100644
--- a/clients/admin/package.json
+++ b/clients/admin/package.json
@@ -45,7 +45,6 @@
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.18",
     "globals": "^15.14.0",
-    "openapi-typescript": "^7.6.1",
     "tailwindcss": "^4.0.6",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.23.0",
diff --git a/clients/dashboard/src/api/chat.ts b/clients/dashboard/src/api/chat.ts
index 8590f47bd9..086e34b3c1 100644
--- a/clients/dashboard/src/api/chat.ts
+++ b/clients/dashboard/src/api/chat.ts
@@ -22,7 +22,6 @@ export type ChannelMemberDto = {
   role: ChannelMemberRoleValue;
   joinedAtUtc: string;
   lastReadMessageId?: string | null;
-  isMuted: boolean;
 };
 
 export type ChannelDto = {
diff --git a/clients/dashboard/src/lib/api-client.ts b/clients/dashboard/src/lib/api-client.ts
index 6ee8bedecc..f37f45f226 100644
--- a/clients/dashboard/src/lib/api-client.ts
+++ b/clients/dashboard/src/lib/api-client.ts
@@ -119,6 +119,9 @@ export async function refreshAccessToken() {
       ...(tenant ? { tenant } : {}),
     },
     body: JSON.stringify({ token: accessToken, refreshToken }),
+    // A stalled refresh would otherwise hang forever and block every queued
+    // 401-retry awaiting the shared refreshPromise.
+    signal: AbortSignal.timeout(DEFAULT_TIMEOUT_MS),
   });
 
   if (!response.ok) {
diff --git a/clients/dashboard/src/pages/chat/message.tsx b/clients/dashboard/src/pages/chat/message.tsx
index 4ef86b9359..8ab25c76c1 100644
--- a/clients/dashboard/src/pages/chat/message.tsx
+++ b/clients/dashboard/src/pages/chat/message.tsx
@@ -34,6 +34,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { cn } from "@/lib/cn";
+import { describe } from "@/lib/list-helpers";
 import { useUserByUsername, useUserDisplay } from "@/lib/use-user-display";
 import { usePresence } from "@/realtime/use-presence";
 import { groupReactions, shortTime } from "@/pages/chat/chat-utils";
@@ -568,7 +569,7 @@ function MentionPill({ username }: { username: string }) {
       setOpen(false);
       navigate(`/chat/${channelId}`);
     },
-    onError: () => toast.error("Couldn't open DM"),
+    onError: (err) => toast.error("Couldn't open DM", { description: describe(err) }),
   });
 
   const displayName =
@@ -719,7 +720,7 @@ function MessageActions({
       setConfirmingDelete(false);
       toast.success("Message deleted");
     },
-    onError: () => toast.error("Couldn't delete the message"),
+    onError: (err) => toast.error("Couldn't delete the message", { description: describe(err) }),
   });
 
   const pinMutation = useMutation({
@@ -733,7 +734,7 @@ function MessageActions({
       void queryClient.invalidateQueries({ queryKey: ["chat", "pinned", message.channelId] });
       toast.success(message.isPinned ? "Unpinned" : "Pinned");
     },
-    onError: () => toast.error("Couldn't update the pin."),
+    onError: (err) => toast.error("Couldn't update the pin", { description: describe(err) }),
   });
 
   if (isDeleted) return null;
diff --git a/clients/dashboard/src/pages/tickets/ticket-detail.tsx b/clients/dashboard/src/pages/tickets/ticket-detail.tsx
index 2395790967..a112a0fa0c 100644
--- a/clients/dashboard/src/pages/tickets/ticket-detail.tsx
+++ b/clients/dashboard/src/pages/tickets/ticket-detail.tsx
@@ -372,7 +372,8 @@ function CommentsSection({
   const [body, setBody] = useState("");
 
   const mutation = useMutation({
-    mutationFn: () => addTicketComment(ticketId, body.trim()),
+    // Per-call data flows through mutate(arg), never closed-over state (golden rule #9).
+    mutationFn: (text: string) => addTicketComment(ticketId, text),
     onSuccess: () => {
       setBody("");
       toast.success("Comment posted");
@@ -416,7 +417,7 @@ function CommentsSection({
         onSubmit={(e) => {
           e.preventDefault();
           if (!body.trim() || disabled) return;
-          mutation.mutate();
+          mutation.mutate(body.trim());
         }}
         className={cn(
           "mt-5 rounded-xl border bg-[var(--color-card)]",
@@ -427,6 +428,7 @@ function CommentsSection({
         <textarea
           value={body}
           onChange={(e) => setBody(e.target.value)}
+          aria-label="Add a comment"
           placeholder={
             disabled
               ? "Reopen the ticket to add a new comment."
diff --git a/clients/dashboard/tests/chat/chat.spec.ts b/clients/dashboard/tests/chat/chat.spec.ts
index b1c3c6e412..b01711f5a3 100644
--- a/clients/dashboard/tests/chat/chat.spec.ts
+++ b/clients/dashboard/tests/chat/chat.spec.ts
@@ -51,7 +51,6 @@ const CHANNEL_ENGINEERING = {
       role: "Admin",
       joinedAtUtc: "2026-05-01T10:00:00Z",
       lastReadMessageId: null,
-      isMuted: false,
     },
   ],
 };
diff --git a/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.Designer.cs b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.Designer.cs
new file mode 100644
index 0000000000..7dcfcee044
--- /dev/null
+++ b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.Designer.cs
@@ -0,0 +1,378 @@
+// <auto-generated />
+using System;
+using FSH.Modules.Chat.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FSH.Starter.Migrations.PostgreSQL.Chat
+{
+    [DbContext(typeof(ChatDbContext))]
+    [Migration("20260612201021_DropChannelMemberIsMuted")]
+    partial class DropChannelMemberIsMuted
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("chat")
+                .HasAnnotation("ProductVersion", "10.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.ChannelMember", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ChannelId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("JoinedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid?>("LastReadMessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "ChannelId", "TenantId")
+                        .IsUnique()
+                        .HasDatabaseName("IX_ChannelMembers_UserId_ChannelId");
+
+                    b.ToTable("ChannelMembers", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.ChatChannel", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("CreatedByUserId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("DeletedBy")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTimeOffset?>("DeletedOnUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("DirectKey")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrivate")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastMessageAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Slug")
+                        .HasMaxLength(220)
+                        .HasColumnType("character varying(220)");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("DirectKey", "TenantId")
+                        .IsUnique()
+                        .HasDatabaseName("IX_Channels_DirectKey")
+                        .HasFilter("\"Type\" = 0 AND \"IsDeleted\" = FALSE");
+
+                    b.HasIndex("Slug", "TenantId")
+                        .IsUnique()
+                        .HasDatabaseName("IX_Channels_Slug")
+                        .HasFilter("\"Slug\" IS NOT NULL AND \"IsDeleted\" = FALSE");
+
+                    b.ToTable("Channels", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.Message", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AuthorUserId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Body")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ChannelId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("DeletedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("EditedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsPinned")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("PinnedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PinnedByUserId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<int>("ReplyCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentMessageId")
+                        .HasFilter("\"ParentMessageId\" IS NOT NULL");
+
+                    b.HasIndex("ChannelId", "Id")
+                        .IsDescending(false, true);
+
+                    b.HasIndex("ChannelId", "IsPinned")
+                        .HasFilter("\"IsPinned\" = true");
+
+                    b.ToTable("Messages", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("FileAssetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("OriginalFileName")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<long>("SizeBytes")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId");
+
+                    b.ToTable("MessageAttachments", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageMention", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Length")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MentionedUserId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("StartIndex")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MentionedUserId");
+
+                    b.HasIndex("MessageId");
+
+                    b.ToTable("MessageMentions", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Emoji")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("TenantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId", "UserId", "Emoji", "TenantId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_MessageReactions_Message_User_Emoji");
+
+                    b.ToTable("MessageReactions", "chat");
+
+                    b.HasAnnotation("Finbuckle:MultiTenant", true);
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.ChannelMember", b =>
+                {
+                    b.HasOne("FSH.Modules.Chat.Domain.ChatChannel", null)
+                        .WithMany("Members")
+                        .HasForeignKey("ChannelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.Message", b =>
+                {
+                    b.HasOne("FSH.Modules.Chat.Domain.ChatChannel", null)
+                        .WithMany()
+                        .HasForeignKey("ChannelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageAttachment", b =>
+                {
+                    b.HasOne("FSH.Modules.Chat.Domain.Message", null)
+                        .WithMany("Attachments")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageMention", b =>
+                {
+                    b.HasOne("FSH.Modules.Chat.Domain.Message", null)
+                        .WithMany("Mentions")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.MessageReaction", b =>
+                {
+                    b.HasOne("FSH.Modules.Chat.Domain.Message", null)
+                        .WithMany("Reactions")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.ChatChannel", b =>
+                {
+                    b.Navigation("Members");
+                });
+
+            modelBuilder.Entity("FSH.Modules.Chat.Domain.Message", b =>
+                {
+                    b.Navigation("Attachments");
+
+                    b.Navigation("Mentions");
+
+                    b.Navigation("Reactions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.cs b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.cs
new file mode 100644
index 0000000000..4c13bed774
--- /dev/null
+++ b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/20260612201021_DropChannelMemberIsMuted.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FSH.Starter.Migrations.PostgreSQL.Chat
+{
+    /// <inheritdoc />
+    public partial class DropChannelMemberIsMuted : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsMuted",
+                schema: "chat",
+                table: "ChannelMembers");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsMuted",
+                schema: "chat",
+                table: "ChannelMembers",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}
diff --git a/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/ChatDbContextModelSnapshot.cs b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/ChatDbContextModelSnapshot.cs
index f37d2ddd22..c5c18c72f0 100644
--- a/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/ChatDbContextModelSnapshot.cs
+++ b/src/Host/FSH.Starter.Migrations.PostgreSQL/Chat/ChatDbContextModelSnapshot.cs
@@ -31,9 +31,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ChannelId")
                         .HasColumnType("uuid");
 
-                    b.Property<bool>("IsMuted")
-                        .HasColumnType("boolean");
-
                     b.Property<DateTime>("JoinedAtUtc")
                         .HasColumnType("timestamp with time zone");
 
diff --git a/src/Modules/Chat/Modules.Chat.Contracts/v1/DTOs/ChannelMemberDto.cs b/src/Modules/Chat/Modules.Chat.Contracts/v1/DTOs/ChannelMemberDto.cs
index 6e377b6fee..d0e90e7949 100644
--- a/src/Modules/Chat/Modules.Chat.Contracts/v1/DTOs/ChannelMemberDto.cs
+++ b/src/Modules/Chat/Modules.Chat.Contracts/v1/DTOs/ChannelMemberDto.cs
@@ -5,5 +5,4 @@ public sealed record ChannelMemberDto(
     string UserId,
     ChannelMemberRole Role,
     DateTime JoinedAtUtc,
-    Guid? LastReadMessageId,
-    bool IsMuted);
+    Guid? LastReadMessageId);
diff --git a/src/Modules/Chat/Modules.Chat/Data/Configurations/ChannelMemberConfiguration.cs b/src/Modules/Chat/Modules.Chat/Data/Configurations/ChannelMemberConfiguration.cs
index f206550544..c3a34213bc 100644
--- a/src/Modules/Chat/Modules.Chat/Data/Configurations/ChannelMemberConfiguration.cs
+++ b/src/Modules/Chat/Modules.Chat/Data/Configurations/ChannelMemberConfiguration.cs
@@ -20,7 +20,6 @@ public void Configure(EntityTypeBuilder<ChannelMember> builder)
         builder.Property(x => x.Role).IsRequired().HasConversion<int>();
         builder.Property(x => x.JoinedAtUtc).IsRequired();
         builder.Property(x => x.LastReadMessageId);
-        builder.Property(x => x.IsMuted).IsRequired();
 
         builder.HasIndex(x => new { x.UserId, x.ChannelId }).IsUnique();
         builder.HasIndex(x => x.UserId);
diff --git a/src/Modules/Chat/Modules.Chat/Domain/ChannelMember.cs b/src/Modules/Chat/Modules.Chat/Domain/ChannelMember.cs
index 5d3a994cea..2b0910ac92 100644
--- a/src/Modules/Chat/Modules.Chat/Domain/ChannelMember.cs
+++ b/src/Modules/Chat/Modules.Chat/Domain/ChannelMember.cs
@@ -10,7 +10,6 @@ public sealed class ChannelMember : BaseEntity<Guid>
     public ChannelMemberRole Role { get; private set; }
     public DateTime JoinedAtUtc { get; private set; }
     public Guid? LastReadMessageId { get; private set; }
-    public bool IsMuted { get; }
 
     private ChannelMember() { }
 
diff --git a/src/Modules/Chat/Modules.Chat/Features/v1/Internal/ChatMappers.cs b/src/Modules/Chat/Modules.Chat/Features/v1/Internal/ChatMappers.cs
index c2eb879e32..c19fc2f6d4 100644
--- a/src/Modules/Chat/Modules.Chat/Features/v1/Internal/ChatMappers.cs
+++ b/src/Modules/Chat/Modules.Chat/Features/v1/Internal/ChatMappers.cs
@@ -6,7 +6,7 @@ namespace FSH.Modules.Chat.Features.v1.Internal;
 internal static class ChatMappers
 {
     public static ChannelMemberDto ToDto(this ChannelMember m) =>
-        new(m.Id, m.UserId, m.Role, m.JoinedAtUtc, m.LastReadMessageId, m.IsMuted);
+        new(m.Id, m.UserId, m.Role, m.JoinedAtUtc, m.LastReadMessageId);
 
     public static ChannelDto ToDto(this ChatChannel c, int unreadCount = 0) =>
         new(
diff --git a/src/Modules/Identity/Modules.Identity/Events/TokenGeneratedLogHandler.cs b/src/Modules/Identity/Modules.Identity/Events/TokenGeneratedLogHandler.cs
index 4a18288ee4..71894f075e 100644
--- a/src/Modules/Identity/Modules.Identity/Events/TokenGeneratedLogHandler.cs
+++ b/src/Modules/Identity/Modules.Identity/Events/TokenGeneratedLogHandler.cs
@@ -24,10 +24,10 @@ public Task HandleAsync(TokenGeneratedIntegrationEvent @event, CancellationToken
 
         if (_logger.IsEnabled(LogLevel.Information))
         {
+            // PII minimization: log the pseudonymous UserId only, not the email address.
             _logger.LogInformation(
-                "Token generated for user {UserId} ({Email}) with client {ClientId}, IP {IpAddress}, UserAgent {UserAgent}, expires at {ExpiresAtUtc} (fingerprint: {Fingerprint})",
+                "Token generated for user {UserId} with client {ClientId}, IP {IpAddress}, UserAgent {UserAgent}, expires at {ExpiresAtUtc} (fingerprint: {Fingerprint})",
                 @event.UserId,
-                @event.Email,
                 @event.ClientId,
                 @event.IpAddress,
                 @event.UserAgent,
diff --git a/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEmailHandler.cs b/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEmailHandler.cs
index c5ce04ac2f..5971ea21a6 100644
--- a/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEmailHandler.cs
+++ b/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEmailHandler.cs
@@ -45,7 +45,8 @@ public async Task HandleAsync(UserRegisteredIntegrationEvent @event, Cancellatio
         {
             // Email failures must not break user registration.
             // The email can be retried via the outbox/dead-letter mechanism.
-            _logger.LogWarning(ex, "Failed to send welcome email to {Email}", @event.Email);
+            // PII minimization: identify the recipient by UserId, not email address.
+            _logger.LogWarning(ex, "Failed to send welcome email to user {UserId}", @event.UserId);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEventHandler.cs b/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEventHandler.cs
index b2428a6c54..6fea7ee249 100644
--- a/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEventHandler.cs
+++ b/src/Modules/Identity/Modules.Identity/Events/UserRegisteredEventHandler.cs
@@ -21,10 +21,10 @@ public async ValueTask Handle(UserRegisteredEvent notification, CancellationToke
 
         if (logger.IsEnabled(LogLevel.Information))
         {
+            // PII minimization: log the pseudonymous UserId only, not the email address.
             logger.LogInformation(
-                "User registered: {UserId} ({Email})",
-                notification.UserId,
-                notification.Email);
+                "User registered: {UserId}",
+                notification.UserId);
         }
 
         var integrationEvent = new UserRegisteredIntegrationEvent(
diff --git a/src/Modules/Identity/Modules.Identity/Services/UserRoleService.cs b/src/Modules/Identity/Modules.Identity/Services/UserRoleService.cs
index 097da45f08..52f55a60a3 100644
--- a/src/Modules/Identity/Modules.Identity/Services/UserRoleService.cs
+++ b/src/Modules/Identity/Modules.Identity/Services/UserRoleService.cs
@@ -49,6 +49,10 @@ public async Task<List<UserRoleDto>> GetUserRolesAsync(string userId, Cancellati
         var roles = await roleManager.Roles.AsNoTracking().ToListAsync(cancellationToken)
             ?? throw new NotFoundException("roles not found");
 
+        // Single membership query instead of one IsInRoleAsync round-trip per role.
+        var memberships = await userManager.GetRolesAsync(user);
+        var membershipSet = new HashSet<string>(memberships, StringComparer.OrdinalIgnoreCase);
+
         var userRoles = new List<UserRoleDto>();
         foreach (var role in roles)
         {
@@ -57,7 +61,7 @@ public async Task<List<UserRoleDto>> GetUserRolesAsync(string userId, Cancellati
                 RoleId = role.Id,
                 RoleName = role.Name,
                 Description = role.Description,
-                Enabled = await userManager.IsInRoleAsync(user, role.Name!)
+                Enabled = membershipSet.Contains(role.Name!)
             });
         }