diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 3bde800bf..ee0eee749 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -33,6 +33,7 @@
                         class="small mt-4"
                         v-model="lineItems"
                         :availableVaps="availableVaps"
+                        pageName="payment-method"
                         modalWidgetName="PromoModalWidget" />
 
                     <hr class="my-5" />
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index b4b02b3ed..a68ff4dbe 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -100,6 +100,7 @@ export default {
         modelValue: Object,
         modalWidgetName: String,
         availableVaps: Object,
+        pageName: String,
     },
     computed: {
         promoLinkText() {
@@ -253,44 +254,51 @@ export default {
                     this.promoCode,
                     this.lineItems,
                     this.availableVaps,
-                    "payment-method"
+                    this.pageName
                 );
 
                 if (promoCodeData.isValid) {
-                    const pricedLineItemsToTax = [];
-                    pricedLineItemsToTax.push(...promoCodeData.promoCode);
-                    const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
-                        storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
-                        {
-                            billToAccountNumber: "87291",
-                            providerNumber:
-                                store.getters.order.serviceLocation.provider.providerNumber,
-                            appointmentType: store.getters.order.serviceLocation.appointmentType,
-                            serviceLocationCity: store.getters.order.serviceLocation.city,
-                            serviceLocationState: store.getters.order.serviceLocation.state,
-                            serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
-                            pricedLineItems: pricedLineItemsToTax,
-                        },
-                        "payment-method",
-                        false
-                    );
+                    if (this.pageName == "payment-method") {
+                        const pricedLineItemsToTax = [];
+                        pricedLineItemsToTax.push(...promoCodeData.promoCode);
+                        const taxedLineItems =
+                            await baseMixin.methods.dispatchStoreActionWithLogging(
+                                storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+                                {
+                                    billToAccountNumber: "87291",
+                                    providerNumber:
+                                        store.getters.order.serviceLocation.provider.providerNumber,
+                                    appointmentType:
+                                        store.getters.order.serviceLocation.appointmentType,
+                                    serviceLocationCity: store.getters.order.serviceLocation.city,
+                                    serviceLocationState: store.getters.order.serviceLocation.state,
+                                    serviceLocationZipCode:
+                                        store.getters.order.serviceLocation.zipCode,
+                                    pricedLineItems: pricedLineItemsToTax,
+                                },
+                                "payment-method",
+                                false
+                            );
 
-                    // Match all line items to the line items as they are in the store
-                    // and rebuild the original structure.
-                    this.lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, this.lineItems);
-                    const taxedVaps = mapTaxedLineItemsToStoreFormat(
-                        taxedLineItems,
-                        this.availableVaps
-                    );
-
-                    const getVaps = getVapsThatNeedToBeAddedToSatisfyPromos(
-                        promoCodeData.promoCode,
-                        taxedVaps,
-                        this.lineItems
-                    );
+                        // Match all line items to the line items as they are in the store
+                        // and rebuild the original structure.
+                        this.lineItems = mapTaxedLineItemsToStoreFormat(
+                            taxedLineItems,
+                            this.lineItems
+                        );
+                        const taxedVaps = mapTaxedLineItemsToStoreFormat(
+                            taxedLineItems,
+                            this.availableVaps
+                        );
 
+                        const getVaps = getVapsThatNeedToBeAddedToSatisfyPromos(
+                            promoCodeData.promoCode,
+                            taxedVaps,
+                            this.lineItems
+                        );
+                        this.lineItems?.vaps.push(...getVaps);
+                    }
                     this.lineItems?.promos.push(...promoCodeData.promoCode);
-                    this.lineItems.vaps?.push(...getVaps);
                     this.closeModal();
                 } else {
                     this.getErrorMessage(promoCodeData.errorCode, promoCodeData.additionalInfo);
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f26d24cf7..ff552ee82 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -39,6 +39,14 @@
                         cmsWidgetName="AfterpayModalWidget"
                         :lineItems="availableLineItems" />
 
+                    <promoModalQuestion
+                        class="small mt-4"
+                        v-model="lineItems"
+                        :availableVaps="availableVaps"
+                        :availableLineItems="availableLineItems"
+                        pageName="quote"
+                        modalWidgetName="PromoModalWidget" />
+
                     <textBlock
                         cmsWidgetName="quoteDisclaimer"
                         justifyText="left"
@@ -89,9 +97,13 @@ import { payWithInsuranceStates } from "@/constants/pay-with-insurance-states";
 import {
     revalidatePromosAndValidateQueryStringPromo,
     buildToastMessagesFromRevalidateOrValidatePromoResponse,
+    createPromoSuccessAlert,
+    createPromoErrorAlert,
+    getNewlyInactivatedPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import promoModalQuestion from "@/layouts/payment-method/promo-modal-question/promo-modal-question";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -164,6 +176,7 @@ export default {
 
         // Promo logic
         // Populate the previous state of promos for toast message usage in "next()"
+        const availableVaps = [...resultMap.wipers, resultMap.rainDefense];
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
@@ -175,6 +188,10 @@ export default {
                 pricingResults,
                 "quote"
             );
+
+        const lineItems = store.getters.order.lineItems;
+        lineItems.promos = lineItems.promos ?? [];
+        lineItems.vaps = lineItems.vaps ?? [];
         // End of promo logic
 
         // Call the "next" function to complete the transition to this page.
@@ -183,6 +200,8 @@ export default {
             vm.pricedGlassParts = nullSafeGlassParts;
             vm.supportingItems = resultMap.supportingItems;
             vm.availableLineItems = pricingResults;
+            vm.availableVaps = availableVaps;
+            vm.lineItems = lineItems;
             vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue(vm.availableLineItems);
 
             if (revalidatePromoResponse) {
@@ -212,11 +231,16 @@ export default {
             availableLineItems: null,
             supportingItems: null,
             pricedGlassParts: null,
+            lineItems: [],
+            availableVaps: [],
         };
     },
     computed: {
         allActivePromos() {
-            return this.$store.getters.order.lineItems.promos ?? [];
+            return this.lineItems.promos ?? [];
+        },
+        lineItemsCloneForWatcher() {
+            return Object.assign({}, this.lineItems);
         },
     },
     methods: {
@@ -260,6 +284,29 @@ export default {
         vapsItemsSelectedAction(vapsItemsSelected) {
             this.selectedVaps = vapsItemsSelected;
         },
+        async revalidatePromos() {
+            this.$refs.loadingModal.showModal();
+            const revalidatePromoResponse = await baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.REVALIDATE_ORDER_PROMOS_AND_SAVE_SERVER_DATA,
+                {
+                    activePromosToUse: this.lineItems.promos,
+                    inactivePromosToUse: this.$store.getters.order.payment.inactivePromos,
+                    lineItemsToUse: this.lineItems,
+                },
+                "quote",
+                false
+            );
+            // Handle error alerts here, success alerts are handled in the watcher
+            if (revalidatePromoResponse.errors.length) {
+                getNewlyInactivatedPromos(
+                    this.inactivePromos,
+                    revalidatePromoResponse.errors
+                ).forEach((promoCode) => {
+                    const errorAlert = createPromoErrorAlert(promoCode);
+                    this.$refs.funnelHeader.pushGlobalAlert(errorAlert, errorAlert.shouldAutoFade);
+                });
+            }
+        },
         backButtonAction() {
             vehicleQuestionsMixin.methods.navigateBack(this);
         },
@@ -294,6 +341,14 @@ export default {
             }
 
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
+            this.dispatchStoreAction(
+                storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
+                {
+                    activePromos: this.lineItems.promos,
+                    inactivePromos: this.$store.getters.order.payment.inactivePromos,
+                },
+                false
+            );
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
@@ -309,6 +364,37 @@ export default {
             }
         },
     },
+    watch: {
+        lineItemsCloneForWatcher: {
+            handler(newValue, oldValue) {
+                if (
+                    !oldValue ||
+                    oldValue.length == 0 ||
+                    !oldValue.vaps ||
+                    !newValue ||
+                    newValue.length == 0
+                ) {
+                    return;
+                }
+                if (oldValue.promos.length < newValue.promos.length) {
+                    const oldPromoCodes = oldValue.promos.map(
+                        (promoObject) => promoObject.promoCode
+                    );
+                    const newlyActivatedPromoCodes = newValue.promos.filter(
+                        (newPromo) => !oldPromoCodes.includes(newPromo.promoCode)
+                    );
+                    const alert = createPromoSuccessAlert(newlyActivatedPromoCodes[0].promoCode);
+                    this.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
+                } else if (
+                    oldValue.promos.length == newValue.promos.length &&
+                    oldValue.vaps.length != newValue.vaps.length
+                ) {
+                    this.revalidatePromos();
+                }
+            },
+            deep: true,
+        },
+    },
     components: {
         funnelHeader,
         navbar,
@@ -321,6 +407,7 @@ export default {
         contentGroupModal,
         loadingModal,
         afterpayModalBanner,
+        promoModalQuestion,
     },
 };
 </script>
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 28727f155..6b84f3557 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -63,6 +63,9 @@ export default {
                 this.selectDefaultPackage();
             }
         },
+        activePromos() {
+            this.selectDefaultPackage();
+        },
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
             this.$emit("vapsItemsSelected", VapsProductsInSelectedPackage);