diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e0bf475ac..08ee3565e 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -283,24 +283,29 @@ export default {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
+            await this.dispatchStoreAction(
+                storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+                this.paymentMethod,
+                false
+            );
+
+            await this.dispatchStoreAction(storeActions.SAVE_VAPS, this.lineItems.vaps, false);
+
+            await this.dispatchStoreAction(storeActions.SAVE_PROMOS, this.lineItems.promos, false);
+
             switch (this.paymentMethod) {
                 case paymentMethods.CREDIT_CARD:
-                    this.piaSetup("cc");
+                    this.piaSetup(this.paymentMethod);
                     break;
                 case paymentMethods.PAYPAL:
-                    this.piaSetup("pp");
+                    this.piaSetup(this.paymentMethod);
                     break;
                 case paymentMethods.AFTERPAY:
-                    this.piaSetup("ap");
+                    this.piaSetup(this.paymentMethod);
                     break;
                 default:
                     this.dispatchStoreAction(storeActions.SAVE_PIA_ERROR_CODE, null, false);
                     this.dispatchStoreAction(this.storeActions.SAVE_WORK_ORDER_FLAG, true, false);
-                    this.dispatchStoreAction(
-                        storeActions.SAVE_PAYMENT_METHOD_CHOICE,
-                        this.paymentMethod,
-                        false
-                    );
                     await submitWorkOrder({ pageNameToLog: "payment-method" });
                     this.$router.navigateWithoutSaving(
                         this.navigationScenarios.CLICKED_FORWARD,
@@ -313,11 +318,6 @@ export default {
 
             // since we're leaving the site for pia, clear any save session promises that we will not be able to resolve when we return
             await this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-            await this.dispatchStoreAction(
-                storeActions.SAVE_PAYMENT_METHOD_CHOICE,
-                payNowType,
-                false
-            );
 
             // make sure pia error codes are reset
             this.dispatchStoreAction(storeActions.SAVE_PIA_ERROR_CODE, null, false);
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index d6a6394fe..098f2a521 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -168,6 +168,7 @@ import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config";
+import { paymentMethods } from "@/constants/payment-method-constants";
 import baseMixin from "@/mixins/base-mixin.js";
 
 // Validation
@@ -286,7 +287,16 @@ export default {
                 : store.getters.order.serviceLocation.provider.address.zipCode;
         },
         getPaymentType() {
-            return store.getters.order.payment.piaType;
+            switch (store.getters.order.payment.piaType) {
+                case paymentMethods.AFTERPAY:
+                    return "ap";
+                case paymentMethods.CREDIT_CARD:
+                    return "cc";
+                case paymentMethods.PAYPAL:
+                    return "pp";
+                default:
+                    return store.getters.payment.piaType;
+            }
         },
         getHeaderLine1() {
             if (!this.isPaypal()) {