diff --git a/src/components/berths/berth-columns.tsx b/src/components/berths/berth-columns.tsx
index 42da94ca..2f700d9b 100644
--- a/src/components/berths/berth-columns.tsx
+++ b/src/components/berths/berth-columns.tsx
@@ -176,6 +176,7 @@ function ActionsCell({ row }: { row: { original: BerthRow } }) {
             variant="ghost"
             size="icon"
             className="h-8 w-8"
+            aria-label={`Row actions for berth ${berth.mooringNumber ?? ''}`.trim()}
             onClick={(e) => e.stopPropagation()}
           >
             <MoreHorizontal className="h-4 w-4" aria-hidden />
diff --git a/src/components/clients/client-columns.tsx b/src/components/clients/client-columns.tsx
index 02bbe610..c7512de3 100644
--- a/src/components/clients/client-columns.tsx
+++ b/src/components/clients/client-columns.tsx
@@ -302,6 +302,7 @@ export function getClientColumns({
               variant="ghost"
               size="icon"
               className="h-7 w-7"
+              aria-label={`Row actions for ${row.original.fullName ?? 'client'}`}
               onClick={(e) => e.stopPropagation()}
             >
               <MoreHorizontal className="h-4 w-4" aria-hidden />
diff --git a/src/components/interests/berth-recommender-panel.tsx b/src/components/interests/berth-recommender-panel.tsx
index 86d9aced..5b0a53e9 100644
--- a/src/components/interests/berth-recommender-panel.tsx
+++ b/src/components/interests/berth-recommender-panel.tsx
@@ -503,6 +503,8 @@ export function BerthRecommenderPanel({
                   variant="outline"
                   onClick={() => setFiltersOpen((v) => !v)}
                   disabled={!hasDimensions}
+                  aria-expanded={filtersOpen}
+                  aria-controls="recommender-filters-body"
                 >
                   <Filter className="mr-1.5 size-3.5" aria-hidden />
                   {filtersOpen ? 'Hide filters' : 'Add filters'}
@@ -542,7 +544,9 @@ export function BerthRecommenderPanel({
           </div>
         </div>
         {!collapsed && filtersOpen && hasDimensions ? (
-          <AmenityFilterForm filters={amenityFilters} onChange={setAmenityFilters} />
+          <div id="recommender-filters-body">
+            <AmenityFilterForm filters={amenityFilters} onChange={setAmenityFilters} />
+          </div>
         ) : null}
         {!collapsed && hasDimensions && areaChips.length > 1 ? (
           <div className="flex flex-wrap items-center gap-1.5 pt-1">
diff --git a/src/components/interests/interest-columns.tsx b/src/components/interests/interest-columns.tsx
index 074e240a..fb756f93 100644
--- a/src/components/interests/interest-columns.tsx
+++ b/src/components/interests/interest-columns.tsx
@@ -297,6 +297,7 @@ export function getInterestColumns({
               variant="ghost"
               size="icon"
               className="h-7 w-7"
+              aria-label={`Row actions for ${row.original.clientName ?? 'interest'}`}
               onClick={(e) => e.stopPropagation()}
             >
               <MoreHorizontal className="h-4 w-4" aria-hidden />
diff --git a/src/components/interests/interest-list.tsx b/src/components/interests/interest-list.tsx
index 1b24b127..c6009427 100644
--- a/src/components/interests/interest-list.tsx
+++ b/src/components/interests/interest-list.tsx
@@ -183,11 +183,17 @@ export function InterestList() {
             {/* Kanban view is desktop-only — mobile drops the toggle and
                 falls back to the list/cards view (the board's column
                 horizontal-scroll model is unusable at phone widths). */}
-            <div className="hidden sm:flex items-center border rounded-md overflow-hidden">
+            <div
+              className="hidden sm:flex items-center border rounded-md overflow-hidden"
+              role="group"
+              aria-label="View mode"
+            >
               <Button
                 size="sm"
                 variant={viewMode === 'table' ? 'default' : 'ghost'}
                 className="rounded-none"
+                aria-label="Table view"
+                aria-pressed={viewMode === 'table'}
                 onClick={() => setViewMode('table')}
               >
                 <LayoutList className="h-4 w-4" aria-hidden />
@@ -196,6 +202,8 @@ export function InterestList() {
                 size="sm"
                 variant={viewMode === 'board' ? 'default' : 'ghost'}
                 className="rounded-none"
+                aria-label="Board view"
+                aria-pressed={viewMode === 'board'}
                 onClick={() => setViewMode('board')}
               >
                 <Kanban className="h-4 w-4" aria-hidden />
diff --git a/src/components/interests/interest-tabs.tsx b/src/components/interests/interest-tabs.tsx
index f211e309..e579177c 100644
--- a/src/components/interests/interest-tabs.tsx
+++ b/src/components/interests/interest-tabs.tsx
@@ -555,6 +555,8 @@ function FutureMilestones({
       <button
         type="button"
         onClick={() => setExpanded((v) => !v)}
+        aria-expanded={expanded}
+        aria-controls="future-milestones-body"
         className="flex w-full items-center justify-between gap-2 px-4 py-2.5 text-sm text-muted-foreground hover:text-foreground hover:bg-muted/30 transition-colors"
       >
         <span>
@@ -565,6 +567,7 @@ function FutureMilestones({
       </button>
       {expanded && (
         <div
+          id="future-milestones-body"
           className={cn(
             'grid grid-cols-1 gap-4 p-4 pt-0',
             milestones.length === 1 ? '' : 'lg:grid-cols-2',
diff --git a/src/components/interests/linked-berths-list.tsx b/src/components/interests/linked-berths-list.tsx
index c607374b..538a782a 100644
--- a/src/components/interests/linked-berths-list.tsx
+++ b/src/components/interests/linked-berths-list.tsx
@@ -374,14 +374,14 @@ function LinkedBerthRowItem({
                 htmlFor={`bundle-${row.berthId}`}
                 className="text-sm font-medium cursor-pointer"
               >
-                Mark in EOI bundle
+                Include in EOI
               </Label>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <button
                     type="button"
                     className="inline-flex h-5 w-5 items-center justify-center rounded-full text-muted-foreground hover:bg-muted/60 hover:text-foreground"
-                    aria-label="What does Mark in EOI bundle do?"
+                    aria-label="What does Include in EOI do?"
                   >
                     <HelpCircle className="h-3.5 w-3.5" aria-hidden />
                   </button>
diff --git a/src/components/shared/branded-auth-shell.tsx b/src/components/shared/branded-auth-shell.tsx
index 8d892ce2..5be7aec1 100644
--- a/src/components/shared/branded-auth-shell.tsx
+++ b/src/components/shared/branded-auth-shell.tsx
@@ -29,7 +29,11 @@ export function BrandedAuthShell({ children, branding }: BrandedAuthShellProps)
   const ctx = useAuthBranding();
   const logoUrl = branding?.logoUrl ?? ctx?.logoUrl ?? null;
   const backgroundUrl = branding?.backgroundUrl ?? ctx?.backgroundUrl ?? null;
-  const altText = branding?.appName ?? ctx?.appName ?? 'Sign in';
+  // When no port name is known, treat the logo as decorative — "Sign in"
+  // as alt text was being read on every auth page even when the page
+  // itself isn't a sign-in surface (e.g. password reset, set-password).
+  const appName = branding?.appName ?? ctx?.appName ?? null;
+  const altText = appName ?? '';
   // fixed inset-0 anchors the auth surface to the viewport directly —
   // iOS Safari ignores overflow-hidden on inner divs for body-level
   // scrolling, so a regular `h-dvh overflow-hidden` wrapper doesn't
diff --git a/src/lib/services/supplemental-forms.service.ts b/src/lib/services/supplemental-forms.service.ts
index 52b554c2..4e0e7e50 100644
--- a/src/lib/services/supplemental-forms.service.ts
+++ b/src/lib/services/supplemental-forms.service.ts
@@ -22,7 +22,7 @@ import {
 } from '@/lib/db/schema';
 import { ConflictError, NotFoundError, ValidationError } from '@/lib/errors';
 
-const TOKEN_TTL_DAYS = 30;
+const TOKEN_TTL_DAYS = 14;
 const TOKEN_BYTES = 32; // 256-bit → ~43 base64url chars; brute-force infeasible.
 
 function generateToken(): string {