diff --git a/WORK-RECORDS.md b/WORK-RECORDS.md
index ddc81b4..128b639 100644
--- a/WORK-RECORDS.md
+++ b/WORK-RECORDS.md
@@ -44,6 +44,7 @@
 | workplan | USER-WP-0033 | finished | — | workplans/USER-WP-0033-authentication-policy.md |
 | workplan | USER-WP-0034 | active | — | workplans/USER-WP-0034-access-engine-repository-rename-handoff.md |
 | workplan | USER-WP-0035 | active | — | workplans/USER-WP-0035-onboarding-handoff-findings.md |
+| workplan | USER-WP-0036 | ready | — | workplans/USER-WP-0036-account-situational-awareness.md |
 | task | USER-WP-ADHOC-2026-09-06-T01 | done | — | workplans/ADHOC-2026-09-06.md |
 | task | USER-WP-0001-T1 | done | — | workplans/USER-WP-0001-preparation-and-interface-adoption.md |
 | task | USER-WP-0001-T2 | done | — | workplans/USER-WP-0001-preparation-and-interface-adoption.md |
@@ -224,4 +225,7 @@
 | task | USER-WP-0034-T02 | wait | — | workplans/USER-WP-0034-access-engine-repository-rename-handoff.md |
 | task | USER-WP-0035-T01 | done | — | workplans/USER-WP-0035-onboarding-handoff-findings.md |
 | task | USER-WP-0035-T02 | wait | — | workplans/USER-WP-0035-onboarding-handoff-findings.md |
+| task | USER-WP-0036-T01 | todo | — | workplans/USER-WP-0036-account-situational-awareness.md |
+| task | USER-WP-0036-T02 | todo | — | workplans/USER-WP-0036-account-situational-awareness.md |
+| task | USER-WP-0036-T03 | todo | — | workplans/USER-WP-0036-account-situational-awareness.md |
 | intake | USER-IN-0001 | answered | — | intakes/intakes.md |
diff --git a/workplans/USER-WP-0036-account-situational-awareness.md b/workplans/USER-WP-0036-account-situational-awareness.md
index 5fd1134..5e09cab 100644
--- a/workplans/USER-WP-0036-account-situational-awareness.md
+++ b/workplans/USER-WP-0036-account-situational-awareness.md
@@ -11,6 +11,7 @@ topic_slug: user-engine
 created: "2026-09-26"
 updated: "2026-09-26"
 related: [USER-WP-0026, USER-WP-0028]
+state_hub_workstream_id: "2d182130-88d0-5b17-b2bf-3e28f5df4f37"
 ---
 
 # USER-WP-0036 - Account situational awareness
@@ -42,6 +43,7 @@ and USER-WP-0028-T02. This plan does not infer those decisions.
 id: USER-WP-0036-T01
 status: todo
 priority: high
+state_hub_task_id: "ffc8f42f-5ca3-56a2-8850-d2da9beba72c"
 ```
 
 On `/onboarding`, and in the signed-in home identity block, present three
@@ -80,6 +82,7 @@ checked. Keep the layout readable on a phone.
 id: USER-WP-0036-T02
 status: todo
 priority: high
+state_hub_task_id: "136a27ff-fd3e-5f0a-8a3a-bb080f1965d5"
 ```
 
 An ordinary user changes the active tenant through the existing
@@ -103,6 +106,7 @@ sign-out copy remains the place that explains a remaining shared sign-in.
 id: USER-WP-0036-T03
 status: todo
 priority: medium
+state_hub_task_id: "4c9b0600-5034-58ce-9b02-90a040f6f65f"
 ```
 
 Update `docs/account-journeys.md` U01 and U09 so login state, active access,