diff --git a/site/src/components/intake/Wizard.astro b/site/src/components/intake/Wizard.astro
index 6730e5f..3966325 100644
--- a/site/src/components/intake/Wizard.astro
+++ b/site/src/components/intake/Wizard.astro
@@ -676,7 +676,7 @@ const STEP_LABELS: Record<string, string> = {
           </div>
         `;
         document.querySelector(".pw-wizard-stepbar")?.remove();
-        document.querySelector(".pw-wizard-footer")?.remove();
+        document.querySelector(".pw-wizard-nav")?.remove();
       } else {
         const err = await saveResp.json().catch(() => ({}));
         alert(err.error || "Failed to submit. Please try again.");
diff --git a/site/src/components/intake/steps/PaymentStep.astro b/site/src/components/intake/steps/PaymentStep.astro
index 64ce924..a8b607e 100644
--- a/site/src/components/intake/steps/PaymentStep.astro
+++ b/site/src/components/intake/steps/PaymentStep.astro
@@ -48,37 +48,41 @@ const meta = SERVICE_META[service_slug];
 </style>
 
 <script>
-  const slug = document.querySelector(".pw-step[data-slug]")!.getAttribute("data-slug")!;
-  const methodSel = document.getElementById("pw-pay-method") as HTMLSelectElement;
-  const goBtn = document.getElementById("pw-pay-go") as HTMLButtonElement;
-  const err = document.getElementById("pw-pay-err") as HTMLDivElement;
+  const slugEl = document.querySelector(".pw-step[data-slug]") as HTMLElement | null;
+  const methodSel = document.getElementById("pw-pay-method") as HTMLSelectElement | null;
+  const goBtn = document.getElementById("pw-pay-go") as HTMLButtonElement | null;
+  const err = document.getElementById("pw-pay-err") as HTMLDivElement | null;
 
-  goBtn.addEventListener("click", async () => {
-    err.hidden = true;
-    goBtn.disabled = true; goBtn.textContent = "Creating checkout session…";
-    try {
-      const state = (window as any).PWIntake.get();
-      if (!state.order_number) throw new Error("Order was not created; go back to Review.");
-      const resp = await fetch("/api/v1/checkout/create-session", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          order_id: state.order_number,
-          order_type: "compliance",
-          payment_method: methodSel.value,
-        }),
-      });
-      if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
-      const { checkout_url } = await resp.json();
-      if (!checkout_url) throw new Error("No checkout URL returned.");
-      // Clear the wizard state — success page handles the rest
-      sessionStorage.removeItem(`pw-intake-${slug}`);
-      window.location.href = checkout_url;
-    } catch (e: any) {
-      err.hidden = false;
-      err.textContent = "Could not start checkout: " + e.message;
-      goBtn.disabled = false;
-      goBtn.textContent = "Continue to payment →";
-    }
-  });
+  if (slugEl && methodSel && goBtn && err) {
+    const slug = slugEl.getAttribute("data-slug")!;
+
+    goBtn.addEventListener("click", async () => {
+      err.hidden = true;
+      goBtn.disabled = true; goBtn.textContent = "Creating checkout session…";
+      try {
+        const state = (window as any).PWIntake.get();
+        if (!state.order_number) throw new Error("Order was not created; go back to Review.");
+        const resp = await fetch("/api/v1/checkout/create-session", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            order_id: state.order_number,
+            order_type: "compliance",
+            payment_method: methodSel.value,
+          }),
+        });
+        if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+        const { checkout_url } = await resp.json();
+        if (!checkout_url) throw new Error("No checkout URL returned.");
+        // Clear the wizard state, success page handles the rest
+        sessionStorage.removeItem(`pw-intake-${slug}`);
+        window.location.href = checkout_url;
+      } catch (e: any) {
+        err.hidden = false;
+        err.textContent = "Could not start checkout: " + e.message;
+        goBtn.disabled = false;
+        goBtn.textContent = "Continue to payment →";
+      }
+    });
+  }
 </script>