diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 48da2b7e..e7da2305 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -303,20 +303,22 @@ export default {
                     await submitWorkOrder({
                         pageNameToLog: 'payment-method',
                         submitAfterSave: true
+                    }).then(() => {
+                        useMainStore().resetSubmittedOrder();
+
+                        this.$router.navigate(
+                            this.navigationScenarios.CLICKED_FORWARD,
+                            this.$route
+                        );
+                    }).catch((submitError) => {
+                        useMainStore().setBailout(bailoutMessage.saveSessionError(submitError.data));
+                        this.$router.navigate(
+                            this.navigationScenarios.SAVE_SESSION_FAILED,
+                            this.$route,
+                            { query: { issPage: issPageValues.PAYMENT_METHOD } }
+                        );
                     });
-
-                    useMainStore().resetSubmittedOrder();
-
-                    this.$router.navigate(
-                        this.navigationScenarios.CLICKED_FORWARD,
-                        this.$route
-                    );
                 } catch (error) {
-                    useMainStore().setBailout(bailoutMessage.saveSessionError(error.data));
-                    this.navigate(
-                        this.navigationScenarios.SAVE_SESSION_FAILED,
-                        { query: { issPage: this.issPageValues.PAYMENT_METHOD } }
-                    );
                     console.error(`error: response from submit work order:${error.message}`);
                 }
             } else {
diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue
index be1721c3..84319538 100644
--- a/src/layouts/tpa-submit/tpa-submit.vue
+++ b/src/layouts/tpa-submit/tpa-submit.vue
@@ -356,14 +356,16 @@ export default {
                 await submitWorkOrder({
                     pageNameToLog: 'tpa-submit',
                     submitAfterSave: true
+                }).then(() => {
+                    this.navigate(this.navigationScenarios.CLICKED_FORWARD);
+                }).catch((submitError) => {
+                    useMainStore().setBailout(bailoutMessage.saveSessionError(submitError.data));
+                    this.navigate(
+                        this.navigationScenarios.SAVE_SESSION_FAILED,
+                        { query: { issPage: this.issPageValues.TPA_SUBMIT } }
+                    );
                 });
-                this.navigate(this.navigationScenarios.CLICKED_FORWARD);
             } catch (error) {
-                useMainStore().setBailout(bailoutMessage.saveSessionError(error.data));
-                this.navigate(
-                    this.navigationScenarios.SAVE_SESSION_FAILED,
-                    { query: { issPage: this.issPageValues.TPA_SUBMIT } }
-                );
                 console.error(`error: response from submit work order:${error.message}`);
             }
         },