diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8424152a2..cee4d8562 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -142,9 +142,6 @@ importers:
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.5.0
-      zustand:
-        specifier: ^5.0.11
-        version: 5.0.11(@types/react@19.2.14)(immer@11.1.4)(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4))
     devDependencies:
       '@tailwindcss/postcss':
         specifier: ^4.2.1
@@ -5131,24 +5128,6 @@ packages:
   zod@4.3.6:
     resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
 
-  zustand@5.0.11:
-    resolution: {integrity: sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg==}
-    engines: {node: '>=12.20.0'}
-    peerDependencies:
-      '@types/react': '>=18.0.0'
-      immer: '>=9.0.6'
-      react: '>=18.0.0'
-      use-sync-external-store: '>=1.2.0'
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      immer:
-        optional: true
-      react:
-        optional: true
-      use-sync-external-store:
-        optional: true
-
 snapshots:
 
   '@adobe/css-tools@4.4.4': {}
@@ -10390,10 +10369,3 @@ snapshots:
   zod@3.25.76: {}
 
   zod@4.3.6: {}
-
-  zustand@5.0.11(@types/react@19.2.14)(immer@11.1.4)(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4)):
-    optionalDependencies:
-      '@types/react': 19.2.14
-      immer: 11.1.4
-      react: 19.2.4
-      use-sync-external-store: 1.6.0(react@19.2.4)
diff --git a/web/package.json b/web/package.json
index 2936989e2..11776e144 100644
--- a/web/package.json
+++ b/web/package.json
@@ -33,8 +33,7 @@
     "recharts": "^3.7.0",
     "server-only": "^0.0.1",
     "sonner": "^2.0.7",
-    "tailwind-merge": "^3.5.0",
-    "zustand": "^5.0.11"
+    "tailwind-merge": "^3.5.0"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.2.1",
diff --git a/web/src/components/dashboard/config-editor.tsx b/web/src/components/dashboard/config-editor.tsx
index 3a8ba1ed4..3457ecf58 100644
--- a/web/src/components/dashboard/config-editor.tsx
+++ b/web/src/components/dashboard/config-editor.tsx
@@ -738,9 +738,10 @@ export function ConfigEditor() {
           </div>
         </CardHeader>
         <CardContent className="space-y-4">
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="welcome-message" className="space-y-2">
             <span className="text-sm font-medium">Welcome Message</span>
             <textarea
+              id="welcome-message"
               value={draftConfig.welcome?.message ?? ''}
               onChange={(e) => updateWelcomeMessage(e.target.value)}
               rows={4}
@@ -755,9 +756,10 @@ export function ConfigEditor() {
           </p>
 
           <div className="grid grid-cols-1 gap-4 md:grid-cols-3">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="rules-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Rules Channel ID</span>
               <input
+                id="rules-channel-id"
                 type="text"
                 value={draftConfig.welcome?.rulesChannel ?? ''}
                 onChange={(e) => updateWelcomeField('rulesChannel', e.target.value.trim() || null)}
@@ -766,9 +768,10 @@ export function ConfigEditor() {
                 placeholder="Channel where Accept Rules button lives"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="verified-role-id" className="space-y-2">
               <span className="text-sm font-medium">Verified Role ID</span>
               <input
+                id="verified-role-id"
                 type="text"
                 value={draftConfig.welcome?.verifiedRole ?? ''}
                 onChange={(e) => updateWelcomeField('verifiedRole', e.target.value.trim() || null)}
@@ -777,9 +780,10 @@ export function ConfigEditor() {
                 placeholder="Role granted after rules acceptance"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="intro-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Intro Channel ID</span>
               <input
+                id="intro-channel-id"
                 type="text"
                 value={draftConfig.welcome?.introChannel ?? ''}
                 onChange={(e) => updateWelcomeField('introChannel', e.target.value.trim() || null)}
@@ -834,7 +838,8 @@ export function ConfigEditor() {
                       ✕
                     </Button>
                   </div>
-                  <RoleSelector id="admin-role"
+                  <RoleSelector
+                    id="admin-role"
                     guildId={guildId}
                     selected={opt.roleId ? [opt.roleId] : []}
                     onChange={(selected) => {
@@ -928,9 +933,10 @@ export function ConfigEditor() {
             </div>
           </CardHeader>
           <CardContent className="space-y-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="alert-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Alert Channel ID</span>
               <input
+                id="alert-channel-id"
                 type="text"
                 value={draftConfig.moderation?.alertChannelId ?? ''}
                 onChange={(e) => updateModerationField('alertChannelId', e.target.value)}
@@ -985,9 +991,10 @@ export function ConfigEditor() {
                 />
               </div>
               <div className="grid grid-cols-2 gap-4">
-                <label htmlFor="admin-role" className="space-y-2">
+                <label htmlFor="max-messages" className="space-y-2">
                   <span className="text-sm text-muted-foreground">Max Messages</span>
                   <input
+                    id="max-messages"
                     type="number"
                     min={1}
                     value={draftConfig.moderation?.rateLimit?.maxMessages ?? 10}
@@ -999,9 +1006,10 @@ export function ConfigEditor() {
                     className={inputClasses}
                   />
                 </label>
-                <label htmlFor="admin-role" className="space-y-2">
+                <label htmlFor="window-seconds" className="space-y-2">
                   <span className="text-sm text-muted-foreground">Window (seconds)</span>
                   <input
+                    id="window-seconds"
                     type="number"
                     min={1}
                     value={draftConfig.moderation?.rateLimit?.windowSeconds ?? 10}
@@ -1015,9 +1023,10 @@ export function ConfigEditor() {
                 </label>
               </div>
               <div className="grid grid-cols-3 gap-4">
-                <label htmlFor="admin-role" className="space-y-2">
+                <label htmlFor="mute-after-triggers" className="space-y-2">
                   <span className="text-sm text-muted-foreground">Mute After Triggers</span>
                   <input
+                    id="mute-after-triggers"
                     type="number"
                     min={1}
                     value={draftConfig.moderation?.rateLimit?.muteAfterTriggers ?? 3}
@@ -1029,9 +1038,10 @@ export function ConfigEditor() {
                     className={inputClasses}
                   />
                 </label>
-                <label htmlFor="admin-role" className="space-y-2">
+                <label htmlFor="mute-window-s" className="space-y-2">
                   <span className="text-sm text-muted-foreground">Mute Window (s)</span>
                   <input
+                    id="mute-window-s"
                     type="number"
                     min={1}
                     value={draftConfig.moderation?.rateLimit?.muteWindowSeconds ?? 300}
@@ -1043,9 +1053,10 @@ export function ConfigEditor() {
                     className={inputClasses}
                   />
                 </label>
-                <label htmlFor="admin-role" className="space-y-2">
+                <label htmlFor="mute-duration-s" className="space-y-2">
                   <span className="text-sm text-muted-foreground">Mute Duration (s)</span>
                   <input
+                    id="mute-duration-s"
                     type="number"
                     min={1}
                     value={draftConfig.moderation?.rateLimit?.muteDurationSeconds ?? 300}
@@ -1072,9 +1083,10 @@ export function ConfigEditor() {
                   label="Link Filtering"
                 />
               </div>
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="blocked-domains" className="space-y-2">
                 <span className="text-sm text-muted-foreground">Blocked Domains</span>
                 <input
+                  id="blocked-domains"
                   type="text"
                   value={(draftConfig.moderation?.linkFilter?.blockedDomains ?? []).join(', ')}
                   onChange={(e) =>
@@ -1116,9 +1128,10 @@ export function ConfigEditor() {
             </div>
           </CardHeader>
           <CardContent className="space-y-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="classify-model" className="space-y-2">
               <span className="text-sm font-medium">Classify Model</span>
               <input
+                id="classify-model"
                 type="text"
                 value={draftConfig.triage?.classifyModel ?? ''}
                 onChange={(e) => updateTriageField('classifyModel', e.target.value)}
@@ -1127,9 +1140,10 @@ export function ConfigEditor() {
                 placeholder="e.g. claude-haiku-4-5"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="respond-model" className="space-y-2">
               <span className="text-sm font-medium">Respond Model</span>
               <input
+                id="respond-model"
                 type="text"
                 value={draftConfig.triage?.respondModel ?? ''}
                 onChange={(e) => updateTriageField('respondModel', e.target.value)}
@@ -1139,9 +1153,10 @@ export function ConfigEditor() {
               />
             </label>
             <div className="grid grid-cols-2 gap-4">
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="classify-budget" className="space-y-2">
                 <span className="text-sm font-medium">Classify Budget</span>
                 <input
+                  id="classify-budget"
                   type="number"
                   step="0.01"
                   min={0}
@@ -1154,9 +1169,10 @@ export function ConfigEditor() {
                   className={inputClasses}
                 />
               </label>
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="respond-budget" className="space-y-2">
                 <span className="text-sm font-medium">Respond Budget</span>
                 <input
+                  id="respond-budget"
                   type="number"
                   step="0.01"
                   min={0}
@@ -1171,9 +1187,10 @@ export function ConfigEditor() {
               </label>
             </div>
             <div className="grid grid-cols-2 gap-4">
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="default-interval-ms" className="space-y-2">
                 <span className="text-sm font-medium">Default Interval (ms)</span>
                 <input
+                  id="default-interval-ms"
                   type="number"
                   min={1}
                   value={draftConfig.triage?.defaultInterval ?? 3000}
@@ -1185,9 +1202,10 @@ export function ConfigEditor() {
                   className={inputClasses}
                 />
               </label>
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="timeout-ms" className="space-y-2">
                 <span className="text-sm font-medium">Timeout (ms)</span>
                 <input
+                  id="timeout-ms"
                   type="number"
                   min={1}
                   value={draftConfig.triage?.timeout ?? 30000}
@@ -1201,9 +1219,10 @@ export function ConfigEditor() {
               </label>
             </div>
             <div className="grid grid-cols-2 gap-4">
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="context-messages" className="space-y-2">
                 <span className="text-sm font-medium">Context Messages</span>
                 <input
+                  id="context-messages"
                   type="number"
                   min={1}
                   value={draftConfig.triage?.contextMessages ?? 10}
@@ -1215,9 +1234,10 @@ export function ConfigEditor() {
                   className={inputClasses}
                 />
               </label>
-              <label htmlFor="admin-role" className="space-y-2">
+              <label htmlFor="max-buffer-size" className="space-y-2">
                 <span className="text-sm font-medium">Max Buffer Size</span>
                 <input
+                  id="max-buffer-size"
                   type="number"
                   min={1}
                   value={draftConfig.triage?.maxBufferSize ?? 30}
@@ -1266,9 +1286,10 @@ export function ConfigEditor() {
                 label="Status Reactions"
               />
             </div>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="moderation-log-channel" className="space-y-2">
               <span className="text-sm font-medium">Moderation Log Channel</span>
               <input
+                id="moderation-log-channel"
                 type="text"
                 value={draftConfig.triage?.moderationLogChannel ?? ''}
                 onChange={(e) => updateTriageField('moderationLogChannel', e.target.value)}
@@ -1298,9 +1319,10 @@ export function ConfigEditor() {
           </div>
         </CardHeader>
         <CardContent className="space-y-4">
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="channel-id" className="space-y-2">
             <span className="text-sm font-medium">Channel ID</span>
             <input
+              id="channel-id"
               type="text"
               value={draftConfig.starboard?.channelId ?? ''}
               onChange={(e) => updateStarboardField('channelId', e.target.value)}
@@ -1310,9 +1332,10 @@ export function ConfigEditor() {
             />
           </label>
           <div className="grid grid-cols-2 gap-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="threshold" className="space-y-2">
               <span className="text-sm font-medium">Threshold</span>
               <input
+                id="threshold"
                 type="number"
                 min={1}
                 value={draftConfig.starboard?.threshold ?? 3}
@@ -1324,10 +1347,11 @@ export function ConfigEditor() {
                 className={inputClasses}
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="emoji" className="space-y-2">
               <span className="text-sm font-medium">Emoji</span>
               <div className="flex items-center gap-2">
                 <input
+                  id="emoji"
                   type="text"
                   value={draftConfig.starboard?.emoji ?? '*'}
                   onChange={(e) => updateStarboardField('emoji', e.target.value.trim() || '*')}
@@ -1363,9 +1387,10 @@ export function ConfigEditor() {
               label="Self-Star Allowed"
             />
           </div>
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="ignored-channels" className="space-y-2">
             <span className="text-sm font-medium">Ignored Channels</span>
             <input
+              id="ignored-channels"
               type="text"
               value={(draftConfig.starboard?.ignoredChannels ?? []).join(', ')}
               onChange={(e) =>
@@ -1404,9 +1429,10 @@ export function ConfigEditor() {
           </div>
         </CardHeader>
         <CardContent className="space-y-4">
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="admin-role-id" className="space-y-2">
             <span className="text-sm font-medium">Admin Role ID</span>
-            <RoleSelector id="admin-role"
+            <RoleSelector
+              id="admin-role-id"
               guildId={guildId}
               selected={
                 draftConfig.permissions?.adminRoleId ? [draftConfig.permissions.adminRoleId] : []
@@ -1417,9 +1443,10 @@ export function ConfigEditor() {
               maxSelections={1}
             />
           </label>
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="moderator-role-id" className="space-y-2">
             <span className="text-sm font-medium">Moderator Role ID</span>
-            <RoleSelector id="admin-role"
+            <RoleSelector
+              id="moderator-role-id"
               guildId={guildId}
               selected={
                 draftConfig.permissions?.moderatorRoleId
@@ -1434,9 +1461,10 @@ export function ConfigEditor() {
               maxSelections={1}
             />
           </label>
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="bot-owners" className="space-y-2">
             <span className="text-sm font-medium">Bot Owners</span>
             <input
+              id="bot-owners"
               type="text"
               value={(draftConfig.permissions?.botOwners ?? []).join(', ')}
               onChange={(e) =>
@@ -1473,9 +1501,10 @@ export function ConfigEditor() {
           </div>
         </CardHeader>
         <CardContent className="space-y-4">
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="max-context-memories" className="space-y-2">
             <span className="text-sm font-medium">Max Context Memories</span>
             <input
+              id="max-context-memories"
               type="number"
               min={1}
               value={draftConfig.memory?.maxContextMemories ?? 10}
@@ -1668,9 +1697,10 @@ export function ConfigEditor() {
             />
           </div>
           <div className="grid grid-cols-2 gap-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="xp-per-message-min" className="space-y-2">
               <span className="text-sm font-medium">XP per Message (min)</span>
               <input
+                id="xp-per-message-min"
                 type="number"
                 min={1}
                 max={100}
@@ -1690,9 +1720,10 @@ export function ConfigEditor() {
                 className={inputClasses}
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="xp-per-message-max" className="space-y-2">
               <span className="text-sm font-medium">XP per Message (max)</span>
               <input
+                id="xp-per-message-max"
                 type="number"
                 min={1}
                 max={100}
@@ -1712,9 +1743,10 @@ export function ConfigEditor() {
                 className={inputClasses}
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="xp-cooldown-seconds" className="space-y-2">
               <span className="text-sm font-medium">XP Cooldown (seconds)</span>
               <input
+                id="xp-cooldown-seconds"
                 type="number"
                 min={0}
                 value={draftConfig.reputation?.xpCooldownSeconds ?? 60}
@@ -1730,9 +1762,10 @@ export function ConfigEditor() {
                 className={inputClasses}
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="announce-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Announce Channel ID</span>
               <input
+                id="announce-channel-id"
                 type="text"
                 value={draftConfig.reputation?.announceChannelId ?? ''}
                 onChange={(e) =>
@@ -1750,11 +1783,12 @@ export function ConfigEditor() {
               />
             </label>
           </div>
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="level-thresholds-comma-separat" className="space-y-2">
             <span className="text-sm font-medium">
               Level Thresholds (comma-separated XP values)
             </span>
             <input
+              id="level-thresholds-comma-separat"
               type="text"
               value={(
                 draftConfig.reputation?.levelThresholds ?? [
@@ -1806,9 +1840,10 @@ export function ConfigEditor() {
             Auto-post a daily coding challenge with hint and solve tracking.
           </p>
           <div className="grid grid-cols-2 gap-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="challenge-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Challenge Channel ID</span>
               <input
+                id="challenge-channel-id"
                 type="text"
                 value={draftConfig.challenges?.channelId ?? ''}
                 onChange={(e) =>
@@ -1828,9 +1863,10 @@ export function ConfigEditor() {
                 placeholder="Channel ID for daily challenges"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="post-time-hh-mm" className="space-y-2">
               <span className="text-sm font-medium">Post Time (HH:MM)</span>
               <input
+                id="post-time-hh-mm"
                 type="text"
                 value={draftConfig.challenges?.postTime ?? '09:00'}
                 onChange={(e) =>
@@ -1891,9 +1927,10 @@ export function ConfigEditor() {
             />
           </div>
           <div className="grid grid-cols-2 gap-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="feed-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Feed Channel ID</span>
               <input
+                id="feed-channel-id"
                 type="text"
                 value={draftConfig.github?.feed?.channelId ?? ''}
                 onChange={(e) =>
@@ -1910,9 +1947,10 @@ export function ConfigEditor() {
                 placeholder="Channel ID for GitHub updates"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="poll-interval-minutes" className="space-y-2">
               <span className="text-sm font-medium">Poll Interval (minutes)</span>
               <input
+                id="poll-interval-minutes"
                 type="number"
                 min={1}
                 value={draftConfig.github?.feed?.pollIntervalMinutes ?? 5}
@@ -1954,9 +1992,10 @@ export function ConfigEditor() {
           </div>
         </CardHeader>
         <CardContent className="space-y-4">
-          <label htmlFor="admin-role" className="space-y-2">
+          <label htmlFor="ticket-mode" className="space-y-2">
             <span className="text-sm font-medium">Ticket Mode</span>
             <select
+              id="ticket-mode"
               value={draftConfig.tickets?.mode ?? 'thread'}
               onChange={(e) =>
                 updateDraftConfig((prev) => ({
@@ -1976,9 +2015,10 @@ export function ConfigEditor() {
             </p>
           </label>
           <div className="grid grid-cols-2 gap-4">
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="support-role-id" className="space-y-2">
               <span className="text-sm font-medium">Support Role ID</span>
               <input
+                id="support-role-id"
                 type="text"
                 value={draftConfig.tickets?.supportRole ?? ''}
                 onChange={(e) =>
@@ -1992,9 +2032,10 @@ export function ConfigEditor() {
                 placeholder="Role ID for support staff"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="category-channel-id" className="space-y-2">
               <span className="text-sm font-medium">Category Channel ID</span>
               <input
+                id="category-channel-id"
                 type="text"
                 value={draftConfig.tickets?.category ?? ''}
                 onChange={(e) =>
@@ -2008,9 +2049,10 @@ export function ConfigEditor() {
                 placeholder="Category for tickets"
               />
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="auto-close-hours" className="space-y-2">
               <span className="text-sm font-medium">Auto-Close Hours</span>
               <input
+                id="auto-close-hours"
                 type="number"
                 min="1"
                 max="720"
@@ -2030,9 +2072,10 @@ export function ConfigEditor() {
                 Hours of inactivity before warning (then +24h to close)
               </p>
             </label>
-            <label htmlFor="admin-role" className="space-y-2">
+            <label htmlFor="max-open-per-user" className="space-y-2">
               <span className="text-sm font-medium">Max Open Per User</span>
               <input
+                id="max-open-per-user"
                 type="number"
                 min="1"
                 max="20"
diff --git a/web/src/components/dashboard/config-sections/ModerationSection.tsx b/web/src/components/dashboard/config-sections/ModerationSection.tsx
index e9b20e2d0..cbd9400f4 100644
--- a/web/src/components/dashboard/config-sections/ModerationSection.tsx
+++ b/web/src/components/dashboard/config-sections/ModerationSection.tsx
@@ -67,9 +67,10 @@ export function ModerationSection({
       </CardHeader>
       <CardContent className="space-y-4">
         <div className="space-y-2">
-          <Label>Alert Channel</Label>
+          <Label htmlFor="alert-channel">Alert Channel</Label>
           {guildId ? (
             <ChannelSelector
+              id="alert-channel"
               guildId={guildId}
               selected={selectedChannels}
               onChange={handleChannelChange}
diff --git a/web/src/components/dashboard/config-sections/TriageSection.tsx b/web/src/components/dashboard/config-sections/TriageSection.tsx
index 6fcf9e570..d0b13ddf0 100644
--- a/web/src/components/dashboard/config-sections/TriageSection.tsx
+++ b/web/src/components/dashboard/config-sections/TriageSection.tsx
@@ -172,9 +172,10 @@ export function TriageSection({
           />
         </div>
         <div className="space-y-2">
-          <Label>Moderation Log Channel</Label>
+          <Label htmlFor="moderation-log-channel">Moderation Log Channel</Label>
           {guildId ? (
             <ChannelSelector
+              id="moderation-log-channel"
               guildId={guildId}
               selected={selectedChannels}
               onChange={handleChannelChange}
diff --git a/web/src/components/ui/channel-selector.tsx b/web/src/components/ui/channel-selector.tsx
index 5e0a35186..2294e23c0 100644
--- a/web/src/components/ui/channel-selector.tsx
+++ b/web/src/components/ui/channel-selector.tsx
@@ -61,6 +61,7 @@ interface ChannelSelectorProps {
   className?: string;
   maxSelections?: number;
   filter?: ChannelTypeFilter;
+  id?: string;
 }
 
 function getChannelIcon(type: number) {
@@ -173,6 +174,7 @@ export function ChannelSelector({
   className,
   maxSelections,
   filter = 'all',
+  id,
 }: ChannelSelectorProps) {
   const [open, setOpen] = React.useState(false);
   const [channels, setChannels] = React.useState<DiscordChannel[]>([]);
@@ -296,6 +298,7 @@ export function ChannelSelector({
             aria-expanded={open}
             disabled={disabled || loading}
             className="w-full justify-between"
+            id={id}
           >
             <span className="truncate">
               {selected.length > 0
diff --git a/web/src/components/ui/form.tsx b/web/src/components/ui/form.tsx
index 2f8431ae0..ba1a9d50a 100644
--- a/web/src/components/ui/form.tsx
+++ b/web/src/components/ui/form.tsx
@@ -108,11 +108,9 @@ function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
 
   // Merge caller-provided aria-describedby with form field IDs
   const callerDescribedBy = props['aria-describedby'];
-  const fieldDescribedBy = !error 
-    ? formDescriptionId 
-    : `${formDescriptionId} ${formMessageId}`;
-  const ariaDescribedBy = callerDescribedBy 
-    ? `${fieldDescribedBy} ${callerDescribedBy}` 
+  const fieldDescribedBy = !error ? formDescriptionId : `${formDescriptionId} ${formMessageId}`;
+  const ariaDescribedBy = callerDescribedBy
+    ? `${fieldDescribedBy} ${callerDescribedBy}`
     : fieldDescribedBy;
 
   return (
diff --git a/web/src/components/ui/role-selector.tsx b/web/src/components/ui/role-selector.tsx
index 2b1409d52..75e7410e8 100644
--- a/web/src/components/ui/role-selector.tsx
+++ b/web/src/components/ui/role-selector.tsx
@@ -25,6 +25,7 @@ export interface DiscordRole {
 interface RoleSelectorProps {
   guildId: string;
   selected: string[];
+  id?: string;
   onChange: (selected: string[]) => void;
   placeholder?: string;
   disabled?: boolean;
@@ -57,6 +58,7 @@ export function RoleSelector({
   disabled = false,
   className,
   maxSelections,
+  id,
 }: RoleSelectorProps) {
   const [open, setOpen] = React.useState(false);
   const [roles, setRoles] = React.useState<DiscordRole[]>([]);
@@ -167,6 +169,7 @@ export function RoleSelector({
             aria-expanded={open}
             disabled={disabled || loading}
             className="w-full justify-between"
+            id={id}
           >
             <span className="truncate">
               {selected.length > 0
diff --git a/web/src/stores/discord-entities.ts b/web/src/stores/discord-entities.ts
deleted file mode 100644
index 75ab2ca40..000000000
--- a/web/src/stores/discord-entities.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Zustand store for caching Discord entities (channels and roles) per guild.
- * Reduces redundant API calls when reopening selectors and shares data across instances.
- */
-import { create } from 'zustand';
-
-export interface DiscordChannel {
-  id: string;
-  name: string;
-  type: number;
-}
-
-export interface DiscordRole {
-  id: string;
-  name: string;
-  color: number;
-}
-
-interface DiscordEntitiesState {
-  // Channels cache: guildId -> channels
-  channelsByGuild: Record<string, DiscordChannel[]>;
-  // Roles cache: guildId -> roles
-  rolesByGuild: Record<string, DiscordRole[]>;
-
-  // Get cached channels for a guild
-  getChannels: (guildId: string) => DiscordChannel[] | undefined;
-  // Set channels for a guild
-  setChannels: (guildId: string, channels: DiscordChannel[]) => void;
-  // Clear channels for a guild (optional invalidation)
-  clearChannels: (guildId: string) => void;
-
-  // Get cached roles for a guild
-  getRoles: (guildId: string) => DiscordRole[] | undefined;
-  // Set roles for a guild
-  setRoles: (guildId: string, roles: DiscordRole[]) => void;
-  // Clear roles for a guild (optional invalidation)
-  clearRoles: (guildId: string) => void;
-}
-
-export const useDiscordEntitiesStore = create<DiscordEntitiesState>((set, get) => ({
-  channelsByGuild: {},
-  rolesByGuild: {},
-
-  getChannels: (guildId: string) => get().channelsByGuild[guildId],
-
-  setChannels: (guildId: string, channels: DiscordChannel[]) =>
-    set((state) => ({
-      channelsByGuild: { ...state.channelsByGuild, [guildId]: channels },
-    })),
-
-  clearChannels: (guildId: string) =>
-    set((state) => {
-      const { [guildId]: _, ...rest } = state.channelsByGuild;
-      return { channelsByGuild: rest };
-    }),
-
-  getRoles: (guildId: string) => get().rolesByGuild[guildId],
-
-  setRoles: (guildId: string, roles: DiscordRole[]) =>
-    set((state) => ({
-      rolesByGuild: { ...state.rolesByGuild, [guildId]: roles },
-    })),
-
-  clearRoles: (guildId: string) =>
-    set((state) => {
-      const { [guildId]: _, ...rest } = state.rolesByGuild;
-      return { rolesByGuild: rest };
-    }),
-}));