diff --git a/app/javascript/packages/document-capture/components/document-capture.tsx b/app/javascript/packages/document-capture/components/document-capture.tsx
index 5dd591c2de5..5ac4e3d6ba7 100644
--- a/app/javascript/packages/document-capture/components/document-capture.tsx
+++ b/app/javascript/packages/document-capture/components/document-capture.tsx
@@ -111,16 +111,16 @@ function DocumentCapture({ isAsyncForm = false, onStepChange = () => {} }: Docum
     inPersonURL === undefined
       ? []
       : ([
-          {
-            name: 'location',
-            form: InPersonLocationPostOfficeSearchStep,
-            title: t('in_person_proofing.headings.po_search.location'),
-          },
           {
             name: 'prepare',
             form: InPersonPrepareStep,
             title: t('in_person_proofing.headings.prepare'),
           },
+          {
+            name: 'location',
+            form: InPersonLocationPostOfficeSearchStep,
+            title: t('in_person_proofing.headings.po_search.location'),
+          },
           flowPath === 'hybrid' && {
             name: 'switch_back',
             form: InPersonSwitchBackStep,
diff --git a/app/javascript/packages/document-capture/components/in-person-call-to-action.tsx b/app/javascript/packages/document-capture/components/in-person-call-to-action.tsx
index 61625ca68fc..fbe532629ad 100644
--- a/app/javascript/packages/document-capture/components/in-person-call-to-action.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-call-to-action.tsx
@@ -2,7 +2,6 @@ import { useContext } from 'react';
 import { Button } from '@18f/identity-components';
 import { useInstanceId } from '@18f/identity-react-hooks';
 import { t } from '@18f/identity-i18n';
-import useHistoryParam from '@18f/identity-form-steps/use-history-param';
 import AnalyticsContext from '../context/analytics';
 import { InPersonContext } from '../context';
 
@@ -16,7 +15,6 @@ function InPersonCallToAction({ altHeading, altPrompt, altButtonText }: InPerson
   const instanceId = useInstanceId();
   const { trackEvent } = useContext(AnalyticsContext);
   const { inPersonCtaVariantActive } = useContext(InPersonContext);
-  const [, setStepName] = useHistoryParam(undefined);
 
   return (
     <section
@@ -29,12 +27,12 @@ function InPersonCallToAction({ altHeading, altPrompt, altButtonText }: InPerson
       </h2>
       <p>{altPrompt || t('in_person_proofing.body.cta.prompt_detail')}</p>
       <Button
+        type="submit"
         isBig
         isOutline
         isWide
         className="margin-top-3 margin-bottom-1"
         onClick={() => {
-          setStepName('location');
           trackEvent('IdV: verify in person troubleshooting option clicked', {
             in_person_cta_variant: inPersonCtaVariantActive,
           });
diff --git a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
index f5e8fce3792..ee1ee0c0d72 100644
--- a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect, useCallback, useRef, useContext } from 'react';
 import { useI18n } from '@18f/identity-react-i18n';
 import { Alert, PageHeading } from '@18f/identity-components';
 import { request } from '@18f/identity-request';
+import { forceRedirect } from '@18f/identity-url';
 import BackButton from './back-button';
 import AnalyticsContext from '../context/analytics';
 import AddressSearch, {
@@ -12,20 +13,22 @@ import AddressSearch, {
 } from './address-search';
 import InPersonLocations, { FormattedLocation } from './in-person-locations';
 import { InPersonContext } from '../context';
+import UploadContext from '../context/upload';
 
 function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, registerField }) {
-  const { inPersonCtaVariantActive } = useContext(InPersonContext);
+  const { inPersonCtaVariantActive, inPersonURL } = useContext(InPersonContext);
   const { t } = useI18n();
   const [inProgress, setInProgress] = useState<boolean>(false);
   const [isLoadingLocations, setLoadingLocations] = useState<boolean>(false);
   const [autoSubmit, setAutoSubmit] = useState<boolean>(false);
-  const { setSubmitEventMetadata } = useContext(AnalyticsContext);
+  const { trackEvent } = useContext(AnalyticsContext);
   const [locationResults, setLocationResults] = useState<FormattedLocation[] | null | undefined>(
     null,
   );
   const [foundAddress, setFoundAddress] = useState<LocationQuery | null>(null);
   const [apiError, setApiError] = useState<Error | null>(null);
   const [disabledAddressSearch, setDisabledAddressSearch] = useState<boolean>(false);
+  const { flowPath } = useContext(UploadContext);
 
   // ref allows us to avoid a memory leak
   const mountedRef = useRef(false);
@@ -40,13 +43,12 @@ function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, regist
   // useCallBack here prevents unnecessary rerenders due to changing function identity
   const handleLocationSelect = useCallback(
     async (e: any, id: number) => {
+      if (flowPath !== 'hybrid') {
+        e.preventDefault();
+      }
       const selectedLocation = locationResults![id]!;
       const { streetAddress, formattedCityStateZip } = selectedLocation;
       const selectedLocationAddress = `${streetAddress}, ${formattedCityStateZip}`;
-      setSubmitEventMetadata({
-        selected_location: selectedLocationAddress,
-        in_person_cta_variant: inPersonCtaVariantActive,
-      });
       onChange({ selectedLocationAddress });
       if (autoSubmit) {
         setDisabledAddressSearch(true);
@@ -57,8 +59,6 @@ function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, regist
         }, 250);
         return;
       }
-      // prevent navigation from continuing
-      e.preventDefault();
       if (inProgress) {
         return;
       }
@@ -69,16 +69,24 @@ function InPersonLocationPostOfficeSearchStep({ onChange, toPreviousStep, regist
           json: selected,
           method: 'PUT',
         });
+        // In try block set success of request. If the request is successful, fire remaining code?
         if (mountedRef.current) {
           setAutoSubmit(true);
           setImmediate(() => {
-            // continue with navigation
             e.target.disabled = false;
-            e.target.click();
+            if (flowPath !== 'hybrid') {
+              trackEvent('IdV: location submitted', {
+                selected_location: selectedLocationAddress,
+                in_person_cta_variant: inPersonCtaVariantActive,
+              });
+              forceRedirect(inPersonURL!);
+            }
             // allow process to be re-triggered in case submission did not work as expected
             setAutoSubmit(false);
           });
         }
+      } catch {
+        setAutoSubmit(false);
       } finally {
         if (mountedRef.current) {
           setInProgress(false);
diff --git a/app/javascript/packages/document-capture/components/in-person-prepare-step.spec.tsx b/app/javascript/packages/document-capture/components/in-person-prepare-step.spec.tsx
index bcfe3c8252e..6777a26334d 100644
--- a/app/javascript/packages/document-capture/components/in-person-prepare-step.spec.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-prepare-step.spec.tsx
@@ -1,12 +1,7 @@
-import sinon from 'sinon';
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { render } from '@testing-library/react';
 import type { ComponentType } from 'react';
-import { useSandbox } from '@18f/identity-test-helpers';
 import { Provider as MarketingSiteContextProvider } from '../context/marketing-site';
-import { AnalyticsContextProvider } from '../context/analytics';
 import InPersonPrepareStep from './in-person-prepare-step';
-import InPersonContext, { InPersonContextProps } from '../context/in-person';
 
 describe('InPersonPrepareStep', () => {
   const DEFAULT_PROPS = { toPreviousStep() {}, value: {} };
@@ -22,60 +17,6 @@ describe('InPersonPrepareStep', () => {
     ).not.to.exist();
   });
 
-  context('with in person URL', () => {
-    const inPersonURL = '#in_person';
-    const wrapper: ComponentType = ({ children }) => (
-      <InPersonContext.Provider value={{ inPersonURL } as InPersonContextProps}>
-        {children}
-      </InPersonContext.Provider>
-    );
-
-    it('logs prepare step submission when clicking continue', async () => {
-      const trackEvent = sinon.stub();
-      const { getByRole } = render(
-        <AnalyticsContextProvider trackEvent={trackEvent}>
-          <InPersonPrepareStep {...DEFAULT_PROPS} />
-        </AnalyticsContextProvider>,
-        { wrapper },
-      );
-
-      await userEvent.click(getByRole('button', { name: 'forms.buttons.continue' }));
-      await waitFor(() => window.location.hash === inPersonURL);
-
-      expect(trackEvent).to.have.been.calledWith('IdV: prepare submitted');
-    });
-
-    context('when clicking in quick succession', () => {
-      const { clock } = useSandbox({ useFakeTimers: true });
-
-      it('logs submission only once', async () => {
-        const delay = 1000;
-        const trackEvent = sinon
-          .stub()
-          .callsFake(() => new Promise((resolve) => setTimeout(resolve, delay)));
-        const { getByRole } = render(
-          <AnalyticsContextProvider trackEvent={trackEvent}>
-            <InPersonPrepareStep {...DEFAULT_PROPS} />
-          </AnalyticsContextProvider>,
-          { wrapper },
-        );
-
-        const button = getByRole('button', { name: 'forms.buttons.continue' });
-
-        const didFollowLinkOnFirstClick = fireEvent.click(button);
-        const didFollowLinkOnSecondClick = fireEvent.click(button);
-
-        clock.tick(delay);
-
-        await waitFor(() => window.location.hash === inPersonURL);
-
-        expect(didFollowLinkOnFirstClick).to.be.false();
-        expect(didFollowLinkOnSecondClick).to.be.false();
-        expect(trackEvent).to.have.been.calledOnceWith('IdV: prepare submitted');
-      });
-    });
-  });
-
   context('with marketing site context URL', () => {
     const securityAndPrivacyHowItWorksURL = 'http://example.com/security-and-privacy-how-it-works';
     const wrapper: ComponentType = ({ children }) => (
diff --git a/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx b/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
index 6cd9b9c08e9..74948065e85 100644
--- a/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
@@ -1,11 +1,8 @@
-import { useContext, useState } from 'react';
-import type { MouseEventHandler } from 'react';
-import { Alert, Link, PageHeading, ProcessList, ProcessListItem } from '@18f/identity-components';
-import { removeUnloadProtection } from '@18f/identity-url';
+import { useContext, useEffect } from 'react';
+import { Link, PageHeading, ProcessList, ProcessListItem } from '@18f/identity-components';
 import { getConfigValue } from '@18f/identity-config';
 import { useI18n } from '@18f/identity-react-i18n';
 import { FormStepsButton } from '@18f/identity-form-steps';
-import { SpinnerButton } from '@18f/identity-spinner-button';
 import UploadContext from '../context/upload';
 import MarketingSiteContext from '../context/marketing-site';
 import AnalyticsContext from '../context/analytics';
@@ -13,35 +10,19 @@ import BackButton from './back-button';
 import InPersonTroubleshootingOptions from './in-person-troubleshooting-options';
 import { InPersonContext } from '../context';
 
-function InPersonPrepareStep({ toPreviousStep, value }) {
+function InPersonPrepareStep({ toPreviousStep }) {
   const { t } = useI18n();
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const { inPersonURL } = useContext(InPersonContext);
   const { flowPath } = useContext(UploadContext);
-  const { trackEvent } = useContext(AnalyticsContext);
+  const { setSubmitEventMetadata } = useContext(AnalyticsContext);
   const { securityAndPrivacyHowItWorksURL } = useContext(MarketingSiteContext);
-  const { selectedLocationAddress } = value;
+  const { inPersonURL, inPersonCtaVariantActive } = useContext(InPersonContext);
 
-  const onContinue: MouseEventHandler = async (event) => {
-    event.preventDefault();
-
-    if (!isSubmitting) {
-      setIsSubmitting(true);
-      removeUnloadProtection();
-      await trackEvent('IdV: prepare submitted');
-      window.location.href = inPersonURL!;
-    }
-  };
+  useEffect(() => {
+    setSubmitEventMetadata({ in_person_cta_variant: inPersonCtaVariantActive });
+  }, []);
 
   return (
     <>
-      {selectedLocationAddress && (
-        <Alert type="success" className="margin-bottom-4">
-          {t('in_person_proofing.body.prepare.alert_selected_post_office', {
-            full_address: selectedLocationAddress,
-          })}
-        </Alert>
-      )}
       <PageHeading>{t('in_person_proofing.headings.prepare')}</PageHeading>
 
       <p>{t('in_person_proofing.body.prepare.verify_step_about')}</p>
@@ -60,13 +41,10 @@ function InPersonPrepareStep({ toPreviousStep, value }) {
           headingUnstyled
         />
       </ProcessList>
-      {flowPath === 'hybrid' && <FormStepsButton.Continue />}
-      {inPersonURL && flowPath === 'standard' && (
-        <div className="margin-y-5">
-          <SpinnerButton onClick={onContinue} isBig isWide>
-            {t('forms.buttons.continue')}
-          </SpinnerButton>
-        </div>
+      {inPersonURL && flowPath === 'standard' ? (
+        <FormStepsButton.Continue className="margin-y-5" />
+      ) : (
+        <FormStepsButton.Continue />
       )}
       <p>
         {t('in_person_proofing.body.prepare.privacy_disclaimer', {
diff --git a/app/javascript/packages/document-capture/components/review-issues-step.tsx b/app/javascript/packages/document-capture/components/review-issues-step.tsx
index 2549f4acf16..733e0d0963d 100644
--- a/app/javascript/packages/document-capture/components/review-issues-step.tsx
+++ b/app/javascript/packages/document-capture/components/review-issues-step.tsx
@@ -191,7 +191,7 @@ function ReviewIssuesStep({
           actionOnClick={onWarningPageDismissed}
           altActionText={t('in_person_proofing.body.cta.button_variant')}
           altActionOnClick={onInPersonSelected}
-          altHref="#location"
+          altHref="#prepare"
           location="doc_auth_review_issues"
           remainingAttempts={remainingAttempts}
           troubleshootingOptions={
diff --git a/app/javascript/packages/document-capture/context/analytics.tsx b/app/javascript/packages/document-capture/context/analytics.tsx
index 3778cb4c5ef..61088fb71e4 100644
--- a/app/javascript/packages/document-capture/context/analytics.tsx
+++ b/app/javascript/packages/document-capture/context/analytics.tsx
@@ -44,7 +44,7 @@ type AnalyticsContextProviderProps = Pick<AnalyticsContextValue, 'trackEvent'> &
 
 const DEFAULT_EVENT_METADATA: Record<string, any> = {};
 
-export const LOGGED_STEPS: string[] = ['location', 'prepare', 'switch_back'];
+export const LOGGED_STEPS: string[] = ['prepare', 'location', 'switch_back'];
 
 const AnalyticsContext = createContext<AnalyticsContextValue>({
   trackEvent: () => Promise.resolve(),
@@ -71,7 +71,7 @@ export function AnalyticsContextProvider({ children, trackEvent }: AnalyticsCont
 
   const extraAnalyticsAttributes = (stepName) => {
     const extra: EventMetadata = { ...DEFAULT_EVENT_METADATA };
-    if (stepName === 'location') {
+    if (stepName === 'prepare' || stepName === 'location') {
       extra.in_person_cta_variant = inPersonCtaVariantActive;
     }
     return extra;
diff --git a/app/services/analytics_events.rb b/app/services/analytics_events.rb
index 7d1ccb3b50b..a56d418625e 100644
--- a/app/services/analytics_events.rb
+++ b/app/services/analytics_events.rb
@@ -642,9 +642,15 @@ def idv_in_person_prepare_visited(flow_path:, **extra)
   end
 
   # @param [String] flow_path Document capture path ("hybrid" or "standard")
+  # @param [String] in_person_cta_variant Variant testing bucket label
   # The user submitted the in person proofing prepare step
-  def idv_in_person_prepare_submitted(flow_path:, **extra)
-    track_event('IdV: in person proofing prepare submitted', flow_path: flow_path, **extra)
+  def idv_in_person_prepare_submitted(flow_path:, in_person_cta_variant:, **extra)
+    track_event(
+      'IdV: in person proofing prepare submitted',
+      flow_path: flow_path,
+      in_person_cta_variant: in_person_cta_variant,
+      **extra,
+    )
   end
 
   def idv_in_person_proofing_residential_address_submitted(**extra)
diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml
index 1d1392c86c9..73413070b14 100644
--- a/config/locales/in_person_proofing/en.yml
+++ b/config/locales/in_person_proofing/en.yml
@@ -66,7 +66,6 @@ en:
         retail_hours_weekday: 'Monday to Friday:'
         selection: 'This is the location you selected:'
       prepare:
-        alert_selected_post_office: You’ve selected the Post Office at %{full_address}.
         privacy_disclaimer: '%{app_name} is a secure, government website. We and the
           U.S. Postal Service use your data to verify your identity.'
         privacy_disclaimer_link: Learn more about privacy and security.
diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml
index 54b9fa6815e..38dcc007b86 100644
--- a/config/locales/in_person_proofing/es.yml
+++ b/config/locales/in_person_proofing/es.yml
@@ -72,7 +72,6 @@ es:
         retail_hours_weekday: 'De Lunes a Viernes:'
         selection: 'Esta es la oficina que seleccionó:'
       prepare:
-        alert_selected_post_office: Ha seleccionado la oficina de correos a %{full_address}.
         privacy_disclaimer: '%{app_name} es un sitio web seguro del gobierno. Nosotros y
           el Servicio Postal de los Estados Unidos utilizamos sus datos para
           verificar su identidad.'
diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml
index a3226afd88d..14a386f35a0 100644
--- a/config/locales/in_person_proofing/fr.yml
+++ b/config/locales/in_person_proofing/fr.yml
@@ -73,7 +73,6 @@ fr:
         retail_hours_weekday: 'Lundi à Vendredi:'
         selection: 'Il s’agit du bureau que vous avez sélectionné:'
       prepare:
-        alert_selected_post_office: Vous avez sélectionné le bureau de poste à %{full_address}.
         privacy_disclaimer: '%{app_name} est un site gouvernemental sécurisé. Nous et le
           service postal américain utilisons vos données pour vérifier votre
           identité.'
diff --git a/spec/features/idv/analytics_spec.rb b/spec/features/idv/analytics_spec.rb
index 6fdf54a23c0..69e698a000b 100644
--- a/spec/features/idv/analytics_spec.rb
+++ b/spec/features/idv/analytics_spec.rb
@@ -89,7 +89,7 @@
       'IdV: in person proofing location visited' => { flow_path: 'standard', in_person_cta_variant: 'in_person_variant_a' },
       'IdV: in person proofing location submitted' => { flow_path: 'standard', selected_location: '606 E JUNEAU AVE, MILWAUKEE, WI, 53202-9998', in_person_cta_variant: 'in_person_variant_a' },
       'IdV: in person proofing prepare visited' => { flow_path: 'standard' },
-      'IdV: in person proofing prepare submitted' => { flow_path: 'standard' },
+      'IdV: in person proofing prepare submitted' => { flow_path: 'standard', in_person_cta_variant: 'in_person_variant_a' },
       'IdV: in person proofing state_id visited' => { step: 'state_id', flow_path: 'standard', step_count: 1, analytics_id: 'In Person Proofing', irs_reproofing: false },
       'IdV: in person proofing state_id submitted' => { success: true, flow_path: 'standard', step: 'state_id', step_count: 1, analytics_id: 'In Person Proofing', irs_reproofing: false, errors: {} },
       'IdV: in person proofing address visited' => { step: 'address', flow_path: 'standard', step_count: 1, analytics_id: 'In Person Proofing', irs_reproofing: false },
diff --git a/spec/features/idv/in_person_spec.rb b/spec/features/idv/in_person_spec.rb
index 91f53218ebf..c4512542201 100644
--- a/spec/features/idv/in_person_spec.rb
+++ b/spec/features/idv/in_person_spec.rb
@@ -23,12 +23,12 @@
     it 'allows the user to continue down the happy path', allow_browser_log: true do
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
-      # location page
-      complete_location_step
-
       # prepare page
       complete_prepare_step(user)
 
+      # location page
+      complete_location_step
+
       # state ID page
       complete_state_id_step(user)
 
@@ -119,16 +119,16 @@
     sign_in_and_2fa_user(user)
     begin_in_person_proofing(user)
 
-    # location page
-    expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.find_a_post_office'))
-    expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
-    complete_location_step
-
     # prepare page
     expect(page).to(have_content(t('in_person_proofing.body.prepare.verify_step_about')))
     expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.find_a_post_office'))
     complete_prepare_step(user)
 
+    # location page
+    expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.find_a_post_office'))
+    expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
+    complete_location_step
+
     # state ID page
     expect_in_person_step_indicator_current_step(
       t('step_indicator.flows.idv.verify_info'),
@@ -258,22 +258,17 @@
     complete_all_in_person_proofing_steps
   end
 
-  it 'allows the user to go back to document capture from prepare step', allow_browser_log: true do
+  it 'allows the user to go back to document capture from location step', allow_browser_log: true do
     sign_in_and_2fa_user
     begin_in_person_proofing
-
-    # location page
-    expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
-    complete_location_step
-
-    # prepare page
-    expect(page).to have_content(t('in_person_proofing.headings.prepare'), wait: 5)
-    click_button t('forms.buttons.back')
-
-    expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
-
+    complete_prepare_step
     search_for_post_office
     expect(page).to have_css('.location-collection-item', wait: 10)
+    # back to prepare page
+    click_button t('forms.buttons.back')
+    expect(page).to have_content(t('in_person_proofing.headings.prepare'))
+
+    # back to doc capture page
     click_button t('forms.buttons.back')
 
     # Note: This is specifically for failed barcodes. Other cases may use
@@ -344,14 +339,12 @@
 
         # error page
         click_button t('in_person_proofing.body.cta.button')
-
-        # location page
-        expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
-        complete_location_step
-
         # prepare page
         expect(page).to(have_content(t('in_person_proofing.body.prepare.verify_step_about')))
         click_idv_continue
+        # location page
+        expect(page).to have_content(t('in_person_proofing.headings.po_search.location'))
+        complete_location_step
 
         # switch back page
         expect(page).to have_content(t('in_person_proofing.headings.switch_back'))
@@ -446,8 +439,8 @@
          allow_browser_log: true do
         sign_in_and_2fa_user
         begin_in_person_proofing
-        complete_location_step
         complete_prepare_step
+        complete_location_step
         expect(page).to have_current_path(idv_in_person_step_path(step: :state_id), wait: 10)
 
         fill_out_state_id_form_ok(double_address_verification: double_address_verification)
@@ -513,8 +506,8 @@
          allow_browser_log: true do
         sign_in_and_2fa_user
         begin_in_person_proofing
-        complete_location_step
         complete_prepare_step
+        complete_location_step
         expect(page).to have_current_path(idv_in_person_step_path(step: :state_id), wait: 10)
 
         # state id page
@@ -582,8 +575,8 @@
          allow_browser_log: true do
         sign_in_and_2fa_user
         begin_in_person_proofing
-        complete_location_step
         complete_prepare_step
+        complete_location_step
         expect(page).to have_current_path(idv_in_person_step_path(step: :state_id), wait: 10)
 
         fill_out_state_id_form_ok
@@ -661,18 +654,13 @@
 
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
+      complete_prepare_step(user)
       complete_location_step(user)
-
-      expect(page).to have_content(
-        t('in_person_proofing.headings.prepare'), wait: 5
-      )
     end
 
     it 'does not capture separate state id address from residential address' do
       allow(IdentityConfig.store).to receive(:in_person_capture_secondary_id_enabled).
         and_return(true)
-      # prepare page
-      complete_prepare_step(user)
       complete_state_id_step(user)
       complete_address_step(user)
       complete_ssn_step(user)
@@ -688,16 +676,10 @@
 
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
+      complete_prepare_step(user)
       complete_location_step(user)
-
-      expect(page).to have_content(
-        t('in_person_proofing.headings.prepare'), wait: 5
-      )
     end
-    # prepare page
     it 'successfully proceeds through the flow' do
-      complete_prepare_step(user)
-
       complete_state_id_step(user, same_address_as_id: false, double_address_verification: true)
 
       complete_address_step(user, double_address_verification: true)
@@ -734,8 +716,8 @@
 
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
-      complete_location_step(user)
       complete_prepare_step(user)
+      complete_location_step(user)
     end
 
     it 'skips the address page' do
@@ -800,8 +782,8 @@
 
         sign_in_and_2fa_user(user)
         begin_in_person_proofing(user)
-        complete_location_step(user)
         complete_prepare_step(user)
+        complete_location_step(user)
       end
 
       it 'does not update their previous selection of "Yes,
diff --git a/spec/features/idv/steps/in_person/verify_info_spec.rb b/spec/features/idv/steps/in_person/verify_info_spec.rb
index 0fbdda3d5c8..f7b9ecf03f9 100644
--- a/spec/features/idv/steps/in_person/verify_info_spec.rb
+++ b/spec/features/idv/steps/in_person/verify_info_spec.rb
@@ -17,8 +17,8 @@
 
     sign_in_and_2fa_user(user)
     begin_in_person_proofing(user)
-    complete_location_step(user)
     complete_prepare_step(user)
+    complete_location_step(user)
     complete_state_id_step(user)
     complete_address_step(user)
     complete_ssn_step(user)
@@ -79,8 +79,8 @@
 
     sign_in_and_2fa_user(user)
     begin_in_person_proofing(user)
-    complete_location_step(user)
     complete_prepare_step(user)
+    complete_location_step(user)
     complete_state_id_step(user)
     complete_address_step(user)
     complete_ssn_step(user)
diff --git a/spec/features/idv/steps/in_person/verify_step_spec.rb b/spec/features/idv/steps/in_person/verify_step_spec.rb
index 34f8904e0fc..0365029fafc 100644
--- a/spec/features/idv/steps/in_person/verify_step_spec.rb
+++ b/spec/features/idv/steps/in_person/verify_step_spec.rb
@@ -27,8 +27,8 @@
 
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
-      complete_location_step(user)
       complete_prepare_step(user)
+      complete_location_step(user)
       complete_state_id_step(user, double_address_verification: double_address_verification)
       complete_address_step(user, double_address_verification: double_address_verification)
       complete_ssn_step(user)
@@ -98,8 +98,8 @@
        allow_browser_log: true do
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
-      complete_location_step(user)
       complete_prepare_step(user)
+      complete_location_step(user)
       complete_state_id_step(
         user, same_address_as_id: same_address_as_id,
               double_address_verification: double_address_verification
@@ -148,8 +148,8 @@
        allow_browser_log: true do
       sign_in_and_2fa_user(user)
       begin_in_person_proofing(user)
-      complete_location_step(user)
       complete_prepare_step(user)
+      complete_location_step(user)
       complete_state_id_step(
         user, same_address_as_id: same_address_as_id,
               double_address_verification: double_address_verification
diff --git a/spec/support/features/in_person_helper.rb b/spec/support/features/in_person_helper.rb
index d39e41154ab..074d3ceb08f 100644
--- a/spec/support/features/in_person_helper.rb
+++ b/spec/support/features/in_person_helper.rb
@@ -86,6 +86,9 @@ def begin_in_person_proofing(_user = nil)
   end
 
   def search_for_post_office
+    expect(page).to(have_content(t('in_person_proofing.headings.po_search.location')))
+    expect(page).to(have_content(t('in_person_proofing.body.location.po_search.po_search_about')))
+    expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.find_a_post_office'))
     fill_in t('in_person_proofing.body.location.po_search.address_search_label'),
             with: GOOD_ADDRESS1
     click_spinner_button_and_wait(t('in_person_proofing.body.location.po_search.search_button'))
@@ -108,8 +111,10 @@ def complete_location_step(_user = nil)
   end
 
   def complete_prepare_step(_user = nil)
-    expect(page).to have_text(t('forms.buttons.continue'), wait: 10)
-    click_spinner_button_and_wait t('forms.buttons.continue')
+    expect(page).to(have_content(t('in_person_proofing.headings.prepare')))
+    expect(page).to(have_content(t('in_person_proofing.body.prepare.verify_step_about')))
+    expect_in_person_step_indicator_current_step(t('step_indicator.flows.idv.find_a_post_office'))
+    click_on t('forms.buttons.continue')
   end
 
   def complete_state_id_step(_user = nil, same_address_as_id: true,
@@ -142,8 +147,8 @@ def complete_verify_step(_user = nil)
   end
 
   def complete_all_in_person_proofing_steps(user = user_with_2fa)
-    complete_location_step(user)
     complete_prepare_step(user)
+    complete_location_step(user)
     complete_state_id_step(user)
     complete_address_step(user)
     complete_ssn_step(user)