diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index c9592c315..41e5896bd 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -102,6 +102,8 @@ const storeActions = {
     RESET_SUBMITTED_ORDER: "resetSubmittedOrder",
     RESET_EXTERNAL_PARAMETER_STATE: "resetExternalParameterState",
     UPDATE_EXTERNAL_PARAMETER_MMS: "updateExternalParameterMMS",
+
+    SAVE_LOGGING_OPTION: "saveLoggingOption",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 02b05bd28..740c5a47e 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -84,6 +84,7 @@ const storeMutations = {
     UPDATE_STATE_WITH_ORDER_INFORMATION: "updateStateWithOrderInformation",
     UPDATE_SAVE_SESSION_PROMISE: "updateSaveSessionPromise",
     UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
+    UPDATE_LOGGING_OPTION: "updateLoggingOption",
 
     // EXPERIMENT MUTATIONS
     UPDATE_EXPERIMENTS: "updateExperiments",
diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 0bd4ae563..4ff5c0c8e 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -13,7 +13,7 @@ export function updateOrCreateFunnelCookie() {
 
     // Set up cookie with all the props.
     setFunnelCookieProperties({
-        LastTouched: new Date().toUTCString(),
+        LastTouched: new Date().toJSON(),
         SavedSessionTimeoutDate: store.getters.applicationUser.savedSessionTimeout,
         DidHeritageFunnelUpdateLast: false,
         ShouldResetState: false,
diff --git a/src/helpers/heritage-integration/session-helper.js b/src/helpers/heritage-integration/session-helper.js
index 291ebfaf8..d932969d1 100644
--- a/src/helpers/heritage-integration/session-helper.js
+++ b/src/helpers/heritage-integration/session-helper.js
@@ -43,5 +43,5 @@ Function to calculate the date for the saved session timeout.
 export function getDateForSavedSessionTimeout() {
     const currentDate = new Date(new Date().toUTCString());
     currentDate.setDate(currentDate.getDate() + applicationConfig.SAVED_SESSION_TIMEOUT_DAYS);
-    return currentDate.toUTCString();
+    return currentDate.toJSON();
 }
diff --git a/src/helpers/heritage-integration/session-helper.spec.js b/src/helpers/heritage-integration/session-helper.spec.js
index fe3e308da..11440c544 100644
--- a/src/helpers/heritage-integration/session-helper.spec.js
+++ b/src/helpers/heritage-integration/session-helper.spec.js
@@ -81,7 +81,7 @@ describe("getDateForSavedSessionTimeout", () => {
         currentDate.setDate(currentDate.getDate() + applicationConfig.SAVED_SESSION_TIMEOUT_DAYS);
 
         // Act
-        const result = getDateForSavedSessionTimeout();
+        const result = new Date(getDateForSavedSessionTimeout()).toUTCString();
 
         // Assert
         expect(result).toEqual(currentDate.toUTCString());
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 78ec4cc84..fa6fd234c 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -47,15 +47,16 @@
                             v-bind:isDismissible="false" />
                     </div>
 
-                    <div v-if="isRecalibrationOnOrder && shouldHideRecalibration" class="questions-about-service my-5">
+                    <div
+                        v-if="isRecalibrationOnOrder && shouldHideRecalibration"
+                        class="questions-about-service my-5">
                         <textBlock
                             cmsWidgetName="QuestionsAboutYourServiceWidget"
                             justifyText="left"
                             class="service-questions" />
                         <textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" />
                         <hr class="my-5" />
-                        <div
-                            class="d-flex flex-row checkbox-group">
+                        <div class="d-flex flex-row checkbox-group">
                             <checkboxQuestion
                                 cmsWidgetName="RecalConfirmWidget"
                                 class="mb-5"
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 89e095279..84087cb6e 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -97,6 +97,7 @@ export default {
         "updated-mobile-fee-part",
         "updated-contains-military-base",
         "updated-bill-to-account-number",
+        "mobileLocationSelected",
     ],
     data() {
         return {
@@ -286,13 +287,15 @@ export default {
                     // update the page level model
                     this.$emit("update:modelValue", this.internalModel);
 
-                    this.closeModal();
+                    //Page advance to Schedule page
+                    this.$emit("mobileLocationSelected");
                 }
             } else {
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
-                this.closeModal();
+                //Page advance to Schedule page
+                this.$emit("mobileLocationSelected");
             }
         },
     },
@@ -305,6 +308,9 @@ export default {
             deep: true,
         },
     },
+    unmounted() {
+        if (this.isModalOpened) this.closeModal();
+    },
     components: {
         textLink,
         modal,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 9a6e649ec..0496df54c 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -96,7 +96,8 @@
                         validationRules="mobile-location-required"
                         ref="mobileLocationQuestions"
                         linkWidgetName="MobileLocationLinkWidget"
-                        modalWidgetName="MobileLocationModalWidget" />
+                        modalWidgetName="MobileLocationModalWidget"
+                        @mobileLocationSelected="forwardButtonAction" />
 
                     <shopQuestion
                         ref="shopQuestion"
diff --git a/src/router/index.js b/src/router/index.js
index f736854b4..53adc4613 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -460,6 +460,7 @@ async function navigate(
         const promo = getQuerystringParameter(queryStrings.PROMO);
         const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
         const logQs = getQuerystringParameter(queryStrings.LOG);
+        baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
 
         log("------------- router index.js navigate start -----------------");
         log(" --scenario: ", scenario);
diff --git a/src/store/index.js b/src/store/index.js
index 77e745bfe..6a67a9bc7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -184,6 +184,7 @@ const getDefaultState = () => {
             experiments: [],
             triggeredSiteEntry: false,
             affiliateCookies: [],
+            loggingOption: false,
         },
     };
 };
@@ -414,6 +415,9 @@ export const mutations = {
     updateLastPageVisited(state, lastPageVisited) {
         state.applicationUser.lastPageVisited = lastPageVisited;
     },
+    updateLoggingOption(state, loggingOption) {
+        state.applicationUser.loggingOption = loggingOption;
+    },
     // EVENT BUS MUTATIONS
     addEventToBus(state, event) {
         state.applicationUser.eventBus.push(event);
@@ -689,7 +693,9 @@ export const mutations = {
             !sessionInformation.order.payment.isInsurance &&
             !sessionInformation.order.serviceLocation.provider?.providerNumber
         ) {
-            console.log("------------- updateStateWithOrderInformation reset isInsurance -----------------");
+            console.log(
+                "------------- updateStateWithOrderInformation reset isInsurance -----------------"
+            );
             console.log(new Date() + " sessionInformation: " + JSON.stringify(sessionInformation));
             state.order.payment.isInsurance = null;
         } else {
@@ -1031,6 +1037,7 @@ export const actions = {
             endpoint: endpoints.LookupVehicleByVin.url,
             payload: {
                 vin: vin, // EX "1J4GW58S4XC541166"
+                logEnabled: context.getters.applicationUser.loggingOption,
             },
             logApiCall: true,
             pageNameToLog: pageNameToLog,
@@ -3016,6 +3023,15 @@ export const actions = {
         );
     },
 
+    saveLoggingOption(context, loggingOption) {
+        var option = false;
+        if (loggingOption != null) {
+            option = loggingOption == "true" ? true : false;
+        }
+
+        context.commit(storeMutations.UPDATE_LOGGING_OPTION, option);
+    },
+
     async getRecalPartsAndSaveToLineItems(context, { pageNameToLog }) {
         // identify each part that needs recal
         const glassParts = context.state.order?.lineItems?.glassParts
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 313e7e37f..094793bc1 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -404,6 +404,11 @@ describe("Actions", () => {
     it("lookupVehicleByVin action, should return car data", async () => {
         // Arrange
         const context = state;
+        context.getters = {
+            applicationUser: {
+                loggingOption: false,
+            },
+        };
 
         // Act
         globalMethods.callHttpClient.mockImplementation(() => {