diff --git a/site/src/components/intake/steps/EntityStep.astro b/site/src/components/intake/steps/EntityStep.astro
index 90d6433..5058503 100644
--- a/site/src/components/intake/steps/EntityStep.astro
+++ b/site/src/components/intake/steps/EntityStep.astro
@@ -366,9 +366,12 @@
     intoInputs(state.entity || {});
     if (state.email) loadExisting();
 
-    // Auto-fill from ?frn= URL param (first load only)
-    const urlFrn = new URLSearchParams(window.location.search).get("frn");
-    if (urlFrn && !state.entity?.frn) {
+    // Auto-fill from FRN (URL param, or from order's intake_data)
+    const urlFrn = new URLSearchParams(window.location.search).get("frn")
+      || state.intake_data?.frn
+      || state.entity?.frn
+      || "";
+    if (urlFrn && !state.entity?.legal_name) {
       autoFillFromFRN(urlFrn);
     }
     // Restore filing mode