diff --git a/site/src/components/intake/Wizard.astro b/site/src/components/intake/Wizard.astro
index 5cfe4fc..855f963 100644
--- a/site/src/components/intake/Wizard.astro
+++ b/site/src/components/intake/Wizard.astro
@@ -622,7 +622,7 @@ const STEP_LABELS: Record<string, string> = {
       // to and trucking services have no in-wizard payment step.
       const d = state.intake_data || {};
       const email = d.email || state.email || "";
-      const name = d.legal_name || d.entity_name || state.name || "";
+      const name = d.legal_name || d.entity_name || d.provider_name || d.organization_name || state.name || "";
       if (!email || !name) {
         alert("Please enter your business name and email before finishing.");
         nextBtn.disabled = false;
diff --git a/site/src/components/intake/steps/ReviewStep.astro b/site/src/components/intake/steps/ReviewStep.astro
index f535bdd..332f0b8 100644
--- a/site/src/components/intake/steps/ReviewStep.astro
+++ b/site/src/components/intake/steps/ReviewStep.astro
@@ -85,13 +85,22 @@ const vertical = slugVertical(service_slug);
     // Step 1: ensure we have an order_number for this session
     let orderNumber = state.order_number;
     if (!orderNumber) {
+      // Resolve customer email/name robustly. Some intake steps (e.g. NPI/
+      // healthcare) only persist these into intake_data, not the top-level
+      // state.email/state.name that the DOT/?dot= flow sets. Without this
+      // fallback the create POST sent empty strings and the API rejected it
+      // with HTTP 400 ("...are required"), blocking every HC checkout.
+      const d = (state.intake_data || {}) as any;
+      const customerEmail = state.email || d.email || d.contact_email || "";
+      const customerName  = state.name  || d.provider_name || d.organization_name
+        || d.legal_name || d.entity_name || "";
       const createResp = await fetch("/api/v1/compliance-orders", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           service_slug: slug,
-          customer_email: state.email,
-          customer_name: state.name,
+          customer_email: customerEmail,
+          customer_name: customerName,
           telecom_entity_id: state.telecom_entity_id,
           intake_data: state.intake_data,
           // Filing mode + de minimis election (migrations 058/059)