diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index 25610da5..449de6ca 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -354,7 +354,7 @@ export default {
                 addressLine2 += zipCode;
             }
 
-            const addressLine1 = this.toTitleCase(provider?.address?.streetAddress);
+            const addressLine1 = toTitleCase(provider?.address?.streetAddress);
             const joinString = addressLine1.length > 0 && addressLine2.length > 0 ? ', ' : '';
             return [addressLine1, addressLine2].join(joinString);
         },
@@ -376,6 +376,9 @@ export default {
             this.mapZipCode = this.zipCode;
         },
         forwardButtonAction() {
+            if (this.selectedProviderIsSafeliteShop) {
+                useMainStore().updateIsSafeliteProvider(true);
+            }
             const scenario = this.selectedProviderIsSafeliteShop
                 ? this.navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE_SHOP
                 : this.navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP;
@@ -390,7 +393,7 @@ export default {
             }
         },
         getShopButtonDataFromProvider(provider) {
-            const cellNumber = this.toDisplayPhoneNumber(provider?.phoneNumber);
+            const cellNumber = toDisplayPhoneNumber(provider?.phoneNumber);
             const distance = provider?.distanceInMiles !== null && !Number.isNaN(parseFloat(provider?.distanceInMiles))
                 ? +provider.distanceInMiles.toFixed(1)
                 : null;
@@ -403,9 +406,7 @@ export default {
                 buttonBodyCopy: `${this.getProviderAddress(provider)}<br>${cellNumber ?? ''}`,
                 value: provider?.providerNumber ?? ''
             };
-        },
-        toDisplayPhoneNumber,
-        toTitleCase
+        }
     }
 };
 </script>
diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue
index 8a241e05..9886298f 100644
--- a/src/layouts/tpa-submit/tpa-submit.vue
+++ b/src/layouts/tpa-submit/tpa-submit.vue
@@ -242,8 +242,11 @@ export default {
     methods:
         {
             setSections() {
+                const vehicleScenario = useMainStore().isPolicyVehicle
+                    ? this.navigationScenarios.EDIT_POLICY_VEHICLE
+                    : this.navigationScenarios.EDIT_VEHICLE;
                 this.sections = [
-                    this.getSection(this.widget.subheader.vehicle, this.getVehicleLines, this.navigationScenarios.EDIT_VEHICLE),
+                    this.getSection(this.widget.subheader.vehicle, this.getVehicleLines, vehicleScenario),
                     this.getSection(this.widget.subheader.damage, this.getDamageLines, this.navigationScenarios.EDIT_DAMAGE),
                     this.getSection(this.widget.subheader.shop, this.getPreferredShopLines, this.navigationScenarios.EDIT_PREFERRED_SHOP),
                     // eslint-disable-next-line max-len
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 0d4376aa..f71a452a 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -69,6 +69,7 @@ const navigationScenarios = Object.freeze({
     CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP: 'CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP',
 
     // TPA Submit
+    EDIT_POLICY_VEHICLE: 'EDIT_POLICY_VEHICLE',
     EDIT_VEHICLE: 'EDIT_VEHICLE',
     EDIT_DAMAGE: 'EDIT_DAMAGE',
     EDIT_PREFERRED_SHOP: 'EDIT_PREFERRED_SHOP',
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 43371dbe..03860dee 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -641,6 +641,10 @@ const routingTable = () => [
     {
         issPageValue: issPageValues.TPA_SUBMIT,
         maps: [
+            {
+                scenario: navigationScenarios.EDIT_POLICY_VEHICLE,
+                destinationIssPageValue: issPageValues.POLICY_VEHICLES
+            },
             {
                 scenario: navigationScenarios.EDIT_VEHICLE,
                 destinationIssPageValue: issPageValues.VEHICLE_SELECTION
@@ -651,11 +655,11 @@ const routingTable = () => [
             },
             {
                 scenario: navigationScenarios.EDIT_PREFERRED_SHOP,
-                destinationIssPageValue: issPageValues.TPA_SEARCH
+                destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE
             },
             {
                 scenario: navigationScenarios.EDIT_CONTACT_DETAILS,
-                destinationIssPageValue: issPageValues.CONTACT_DETAILS
+                destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
             },
             {
                 scenario: navigationScenarios.CLICKED_BACK,
diff --git a/src/store/index.js b/src/store/index.js
index facfa026..e82cc2ab 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -220,6 +220,7 @@ export const useMainStore = defineStore({
         payment: (state) => state.order.payment,
         policy: (state) => state.order.policy,
         hasExactlyOneChip: () => state.order.damage.numberOfChips === 1,
+        isPolicyVehicle: () => state.order.vehicle.policyVehicleId != null,
         hasAnyNonWindshieldGlassParts: (s) => !s.order.policy.isDamageGlassOnly,
         isMobileAppointment: (state) => state.order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE
             || state.order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP,