diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 741c5371..57c3d583 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -177,16 +177,7 @@
         mixins: [BaseFormMixin],
         data() {
             return {
-                welcomePageModel: {
-                    policyNumber: "",
-                    dateOfLoss: "",
-                    damageCause: "",
-                    damageState: "",
-                    damageCity: "",
-                    isDamageGlassOnly: "",
-                    phoneNumber: "",
-                    email: ""
-                },
+                welcomePageModel: this.getWelcomePageModelFromStore()
             };
         },
         setup() {
@@ -226,20 +217,32 @@
                     this.$route
                 );
             },
+            getWelcomePageModelFromStore() {
+                return {
+                    policyNumber : this.mainStore.order.policy.policyNumber,
+                    dateOfLoss : this.mainStore.order.policy.dateOfLoss,
+                    damageCause : this.mainStore.order.policy.damageCause,
+                    damageState : this.mainStore.order.policy.damageState,
+                    damageCity : this.mainStore.order.policy.damageCity,
+                    isDamageGlassOnly : this.mainStore.order.policy.isDamageGlassOnly,
+                    phoneNumber : this.mainStore.order.customer.phoneNumber,
+                    email : this.mainStore.order.customer.emailAddress,
+                }
+            },
         },
         computed:{
             DamageCauseOptions() {
                 const damageCauseAnswers =  this.getCmsContent("DamageCauseQuestion", "Answers");
-                const answerArray = [];
+                const damageCauseAnswersObj ={};
                 if(damageCauseAnswers)
                 {
                    for (let answer of Object.values(damageCauseAnswers)) {
                         if (answer?.Name) {
-                            answerArray.push(answer.Name);
+                            damageCauseAnswersObj[answer.Name] = answer.Name;
                         }
                     }
                 }
-                return answerArray;
+                return damageCauseAnswersObj;
             },
             DamageGlassOnlyOptions()
             {
diff --git a/src/store/index.js b/src/store/index.js
index e228bee1..641adeb8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,8 +48,6 @@ const getDefaultState = () => {
         damageState: null,
         damageCity: null,
         isDamageGlassOnly: null,
-        phoneNumber: null,
-        email: null,
       },
       customer: {
         address: {
@@ -61,6 +59,7 @@ const getDefaultState = () => {
         firstName: null,
         lastName: null,
         emailAddress: null,
+        phoneNumber: null,
       },
       serviceLocation: {
         address: null,
@@ -663,8 +662,8 @@ export const useMainStore = defineStore({
         this.order.policy.damageState = welcomePageModel?.damageState;
         this.order.policy.damageCity = welcomePageModel?.damageCity;
         this.order.policy.isDamageGlassOnly = welcomePageModel?.isDamageGlassOnly;
-        this.order.policy.phoneNumber = welcomePageModel?.phoneNumber;
-        this.order.policy.email = welcomePageModel?.email;
+        this.order.customer.phoneNumber = welcomePageModel?.phoneNumber;
+        this.order.customer.emailAddress = welcomePageModel?.email;
       },
       savePartQuestionAnswers(partQuestionAnswersArray) {
         // if part question answers have changed, reset subsequent question answers