diff --git a/site/src/components/intake/Wizard.astro b/site/src/components/intake/Wizard.astro
index 83cd892..6f1248d 100644
--- a/site/src/components/intake/Wizard.astro
+++ b/site/src/components/intake/Wizard.astro
@@ -131,6 +131,11 @@ const STEP_LABELS: Record<string, string> = {
 
 <style is:global>
   .pw-wizard { max-width: 820px; margin: 0 auto; padding: 1rem; }
+  .pw-prefill-notice {
+    background: #fef3c7; border: 1px solid #fbbf24; border-radius: 8px;
+    padding: 0.6rem 0.85rem; margin-bottom: 1rem; font-size: 0.82rem;
+    color: #92400e; line-height: 1.5;
+  }
   .pw-wizard-header h1 { margin: 0 0 1rem; color: var(--pw-navy, #1a2744); }
   .pw-wizard-stepbar {
     display: flex; align-items: center; flex-wrap: wrap;
@@ -389,6 +394,17 @@ const STEP_LABELS: Record<string, string> = {
     window.dispatchEvent(new CustomEvent("pw:step-shown", {
       detail: { step: steps[idx], idx },
     }));
+
+    // Show "review this info" notice on pre-filled steps (when accessed via token)
+    if (urlParams.has("token") || urlParams.has("frn")) {
+      const activeStep = wizard.querySelector<HTMLElement>(`.pw-wizard-body > [data-step="${steps[idx]}"]`);
+      if (activeStep && !activeStep.querySelector(".pw-prefill-notice")) {
+        const notice = document.createElement("div");
+        notice.className = "pw-prefill-notice";
+        notice.innerHTML = "We've pre-filled this from your FCC records. Please review carefully and correct any information that is inaccurate or outdated.";
+        activeStep.prepend(notice);
+      }
+    }
   }
 
   document.getElementById("pw-back")!.addEventListener("click", () => {
diff --git a/site/src/components/intake/steps/OfficerStep.astro b/site/src/components/intake/steps/OfficerStep.astro
index 13c4298..b53208d 100644
--- a/site/src/components/intake/steps/OfficerStep.astro
+++ b/site/src/components/intake/steps/OfficerStep.astro
@@ -170,7 +170,8 @@
       // CORES address — only if it looks like an actual street address
       // (skip if it's just the company name, which CORES sometimes returns)
       const coresAddr = (d.cores?.address || "").trim();
-      const looksLikeStreet = coresAddr && /\d/.test(coresAddr) && !/^[A-Z].*\b(LLC|Inc|Corp|Ltd|LP|LLP)\b/i.test(coresAddr);
+      const isCompanyName = /\b(LLC|Inc\.?|Corp\.?|Ltd\.?|L\.?P\.?|LLP|PLLC|Co\.)\s*\.?\s*$/i.test(coresAddr) || coresAddr === d.entity_name;
+      const looksLikeStreet = coresAddr && !isCompanyName;
       if (looksLikeStreet && d.cores.city) {
         suggestions.push({
           name: "",