diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 8fdfc40bb..a4b8800f1 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -18,6 +18,16 @@ import router from "@/router";
     the user has an existing order and they come back in from the Safelite.com CTA.
 */
 export async function getPageToRouteExistingOrderTo(toRoute = {}) {
+    const fmgPage = getQuerystringParameter(queryStrings.FMG_PAGE.toLowerCase());
+    if (fmgPage && fmgPage === fmgPageValues.SERVICE_LOCATION) {
+        const serviceLocationComponent = await getLazyLoadedComponent(
+            fmgPageValues.SERVICE_LOCATION
+        );
+        if (serviceLocationComponent.methods.arePagePrerequisitesValid()) {
+            return fmgPageValues.SERVICE_LOCATION;
+        }
+    }
+
     // If the user is coming in via the Safelite.Com CTA
     if (toRoute.query[queryStrings.START_TYPE] === "fmg") {
         const latestPageRoute = await getLatestPageForRedirection();
diff --git a/src/store/index.js b/src/store/index.js
index 472e15b6d..ffc6e6e08 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -99,6 +99,7 @@ const getDefaultState = () => {
                     coverageVerificationType: null,
                 },
                 parentAccountNumber: 0,
+                billToAccountNumber: null,
                 isPia: null,
                 piaType: null,
                 inactivePromos: null,
@@ -118,6 +119,13 @@ const getDefaultState = () => {
                     lastFour: null,
                 },
             },
+            policy: {
+                currentDeductible: 0,
+                policyNumber: null,
+                dateOfLoss: null,
+                isItac: false,
+                additionalAuthFlag: null,
+            },
             schedule: {
                 date: null,
                 startTime: null,
@@ -656,6 +664,7 @@ export const getters = {
     applicationUser: (state) => state.applicationUser,
     order: (state) => state.order,
     payment: (state) => state.order.payment,
+    policy: (state) => state.order.policy,
     experimentOrder: (state) => {
         return {
             funnelVehicleYear: state.order.vehicle.year,
@@ -1691,6 +1700,7 @@ export const actions = {
                             lastFour: order.payment.ccToken.lastFour,
                         },
                     },
+                    policy: {},
                     serviceLocation: {
                         streetAddress: order.serviceLocation.address,
                         streetAddress2: order.serviceLocation.address2,