diff --git a/site/src/components/intake/steps/OfficerStep.astro b/site/src/components/intake/steps/OfficerStep.astro
index 0d96d88..d4ce09e 100644
--- a/site/src/components/intake/steps/OfficerStep.astro
+++ b/site/src/components/intake/steps/OfficerStep.astro
@@ -201,9 +201,10 @@
       f.zip.value    = oc.zip    || (i === 1 ? (s.entity?.address_zip    || "") : "");
     }
 
-    // Load corporate record suggestions if officer 1 name is empty
-    if (!o[0]?.name && s.entity?.legal_name) {
-      loadOfficerSuggestions(s.entity.legal_name);
+    // Load corporate record suggestions — always show if we have a legal name
+    const legalName = s.entity?.legal_name || s.intake_data?.entity_legal_name || "";
+    if (legalName) {
+      loadOfficerSuggestions(legalName);
     }
   });