diff --git a/src/layouts/bailout-success/bailout-success.vue b/src/layouts/bailout-success/bailout-success.vue
index 57da702a0..5def1ae22 100644
--- a/src/layouts/bailout-success/bailout-success.vue
+++ b/src/layouts/bailout-success/bailout-success.vue
@@ -73,10 +73,11 @@ export default {
         },
         arePagePrerequisitesValid() {
             return (
-                store.getters.order.customer.firstName &&
-                store.getters.order.customer.lastName &&
-                store.getters.order.customer.emailAddress &&
-                store.getters.order.customer.phoneNumber
+                (store.getters.order.customer.firstName &&
+                    store.getters.order.customer.lastName &&
+                    store.getters.order.customer.emailAddress &&
+                    store.getters.order.customer.phoneNumber) ||
+                baseMixin.methods.hasSubmittedOrder()
             );
         },
     },
diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 0c5fb17ae..9388a0865 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -80,15 +80,21 @@ export async function beforeEach(to, from) {
             const exceptionPages = [
                 FUNNEL_START_PAGE.name,
                 routeData.CONFIRMATION.name,
-                routeData.BAILOUT.name,
                 routeData.BAILOUT_SUCCESS.name,
             ];
 
             if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) {
-                router.push({
-                    name: routeData.CONFIRMATION.name,
-                });
-                return false;
+                if (to.name === routeData.BAILOUT.name) {
+                    router.push({
+                        name: routeData.BAILOUT_SUCCESS.name,
+                    });
+                    return false;
+                } else {
+                    router.push({
+                        name: routeData.CONFIRMATION.name,
+                    });
+                    return false;
+                }
             }
         }