diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 9d51ec2f7..1896513a1 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -16,8 +16,8 @@
             <!-- save progress goes into <slot> on questions-page-layout -->
             <saveProgressModalQuestion
                 modalWidgetName="SaveProgressModalWidget"
-                v-if="!isEmailInStoreOnPageLoad"
-                @save-progress="saveProgress" />
+                pageName="capability-questions"
+                v-if="showSaveProgressModal" />
         </questions-page-layout>
     </Form>
 </template>
@@ -38,7 +38,6 @@ import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import baseMixin from "@/mixins/base-mixin.js";
-import { saveQuote } from "@/helpers/heritage-integration/order-helper.js";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -65,7 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     await baseMixin.methods.dispatchStoreAction(
@@ -87,7 +86,7 @@ export default {
             questionsData: null,
             selectedAnswers: {},
             currentGlassIndex: 0,
-            isEmailInStoreOnPageLoad: null,
+            showSaveProgressModal: null,
         };
     },
     computed: {
@@ -157,9 +156,6 @@ export default {
                 this.questionsData
             );
         },
-        saveProgress() {
-            saveQuote({ pageNameToLog: "capability-questions" });
-        },
         async forwardButtonAction() {
             const questionAnswersArray = this.questionsData.map((glass) => {
                 // get answerResult2 of returned answer
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 2f2cc346c..1bcc3d7a8 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -16,8 +16,8 @@
             <!-- save progress goes into <slot> on questions-page-layout -->
             <saveProgressModalQuestion
                 modalWidgetName="SaveProgressModalWidget"
-                v-if="!isEmailInStoreOnPageLoad"
-                @save-progress="saveProgress" />
+                pageName="molding-questions"
+                v-if="showSaveProgressModal" />
         </questions-page-layout>
     </Form>
 </template>
@@ -38,7 +38,6 @@ import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import baseMixin from "@/mixins/base-mixin.js";
-import { saveQuote } from "@/helpers/heritage-integration/order-helper.js";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -65,7 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     await baseMixin.methods.dispatchStoreAction(
@@ -88,7 +87,7 @@ export default {
             questionsData: null,
             selectedAnswers: {},
             currentGlassIndex: 0,
-            isEmailInStoreOnPageLoad: null,
+            showSaveProgressModal: null,
         };
     },
     computed: {
@@ -157,9 +156,6 @@ export default {
                 this.questionsData
             );
         },
-        saveProgress() {
-            saveQuote({ pageNameToLog: "molding-questions" });
-        },
         async forwardButtonAction() {
             const questionAnswersArray = this.questionsData.map((glass) => {
                 return {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index a5441acd6..f905e86c7 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -16,8 +16,8 @@
             <!-- save progress goes into <slot> on questions-page-layout -->
             <saveProgressModalQuestion
                 modalWidgetName="SaveProgressModalWidget"
-                v-if="!isEmailInStoreOnPageLoad"
-                @save-progress="saveProgress" />
+                pageName="part-questions"
+                v-if="showSaveProgressModal" />
         </questions-page-layout>
     </Form>
 </template>
@@ -38,7 +38,6 @@ import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import baseMixin from "@/mixins/base-mixin.js";
-import { saveQuote } from "@/helpers/heritage-integration/order-helper.js";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -65,7 +64,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             if (store.getters.externalParameterState?.isExternalParameter) {
                 if (store.getters.externalParameterServiceZip.zipCode) {
                     const serviceState = store.getters.order.serviceLocation.state;
@@ -89,7 +88,7 @@ export default {
             questionsData: null,
             selectedAnswers: {},
             currentGlassIndex: 0,
-            isEmailInStoreOnPageLoad: null,
+            showSaveProgressModal: null,
         };
     },
     computed: {
@@ -156,9 +155,6 @@ export default {
                 this.questionsData
             );
         },
-        saveProgress() {
-            saveQuote({ pageNameToLog: "part-questions" });
-        },
         async forwardButtonAction() {
             const questionAnswersArray = this.questionsData.map((glass) => {
                 return {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b0a1ffcd9..fd9b90b79 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -48,8 +48,8 @@
 
                         <saveProgressModalQuestion
                             modalWidgetName="SaveProgressModalWidget"
-                            v-if="!isEmailInStoreOnPageLoad"
-                            @save-progress="saveProgress" />
+                            pageName="vehicle-parts"
+                            v-if="showSaveProgressModal" />
                     </div>
                 </div>
             </div>
@@ -75,7 +75,6 @@ import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import baseMixin from "@/mixins/base-mixin.js";
 import { partTypeStrings } from "@/constants/part-type-strings";
-import { saveQuote } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
     name: "vehicle-parts",
@@ -95,7 +94,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
+            vm.showSaveProgressModal = !(emailFromStore?.length > 0);
             // Glass Part Question dynamic component
             Object.keys(vm.$refs)
                 .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
@@ -115,7 +114,7 @@ export default {
             selectedGlassParts: {},
             alertWidgetData: Object,
             alreadyPopulatedPartsData: [],
-            isEmailInStoreOnPageLoad: null,
+            showSaveProgressModal: null,
         };
     },
     computed: {
@@ -234,9 +233,6 @@ export default {
                 });
             });
         },
-        saveProgress() {
-            saveQuote({ pageNameToLog: "vehicle-parts" });
-        },
     },
     mounted() {
         this.LoadInitialPartsData();