diff --git a/src/layouts/entry-page/entry-page.vue b/src/layouts/entry-page/entry-page.vue
index 30b11ad7..b584a1b3 100644
--- a/src/layouts/entry-page/entry-page.vue
+++ b/src/layouts/entry-page/entry-page.vue
@@ -22,7 +22,7 @@
         data() {
         },
         setup() {
-            const mainStore = useMainStore();            
+            const mainStore = useMainStore();
             mainStore.resetISSConfigState();
             return { mainStore };
         },
@@ -80,14 +80,15 @@
                         this.mainStore.issConfig.accountNumber = resp.data.accountNumber;
                         this.mainStore.issConfig.styleSheet = resp.data.styleSheet;
                     }
-
-                    console.log("Client Name after-load: " + mainStore.issConfig.clientName);
-
-                    //this.navigateForward();
-                    //this.$router.push({ path: '/?issPage=welcome-page' });
-                    window.location = "/?issPage=welcome-page";
                 }
 
+                console.log("Client Name after-load: " + mainStore.issConfig.clientName);
+
+                //this.navigateForward();
+                //this.$router.push({ path: '/?issPage=welcome-page' });
+
+                // Forced full location redirect here. We do not want the entry page as part of the flow/path history.
+                window.location = "/?issPage=welcome-page";
             },
         },
         computed:{
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 6502ee57..d3eef1dd 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -187,9 +187,13 @@
         },
         setup() {
             const mainStore = useMainStore();
-
-            console.log(mainStore.issConfig.clientName);
             
+            // Set order account number from the issConfig.
+            mainStore.order.accountNumber = mainStore.issConfig.accountNumber;
+
+            console.log("issConfig account number: " + mainStore.issConfig.accountNumber);
+            console.log("order account number: " + mainStore.order.accountNumber);
+
             return { mainStore };
         },
         async beforeRouteEnter(to, from, next)