diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index b7aa2401..741c5371 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -9,7 +9,7 @@
                     <textboxQuestion
                         inputId="policyNumberField"
                         cmsWidgetName="PolicyNumberQuestion"
-                        v-model="policyNumber"
+                        v-model="welcomePageModel.policyNumber"
                         isRequired
                         ref="policyNumber"
                         disableAutoFill
@@ -21,7 +21,7 @@
                     <textboxQuestion
                         type="date"
                         cmsWidgetName="DateOfLossQuestion"
-                        v-model="dateOfLoss"
+                        v-model="welcomePageModel.dateOfLoss"
                         inputId="dateOfLossField"
                         isRequired
                         ref="dateOfLoss"
@@ -41,7 +41,7 @@
                 <div class="col">
                     <dropdownQuestion
                         cmsWidgetName="DamageCauseQuestion"
-                        v-model="damageCause"
+                        v-model="welcomePageModel.damageCause"
                         ref="damageCause"
                         inputId="damageCauseQuestionField"
                         :options="DamageCauseOptions"
@@ -55,7 +55,7 @@
                     <textboxQuestion
                         inputId="damageCityField"
                         cmsWidgetName="DamageCityQuestion"
-                        v-model="damageCity"
+                        v-model="welcomePageModel.damageCity"
                         isRequired
                         ref="damageCity"
                         disableAutoFill
@@ -66,7 +66,7 @@
                 <div class="col">
                     <dropdownQuestion
                         cmsWidgetName="DamageStateQuestion"
-                        v-model="damageState"
+                        v-model="welcomePageModel.damageState"
                         ref="state"
                         inputId="8fdf9dc2e13e430eb57529499dceb3eb"
                         :options="stateOptions"
@@ -79,7 +79,7 @@
             <div class="row mt-4">
                     <buttonQuestion
                         cmsWidgetName="GlassOnlyQuestion"
-                        v-model="isDamageGlassOnly"
+                        v-model="welcomePageModel.isDamageGlassOnly"
                         inputId = "isDamageGlassOnly"
                         :answers="DamageGlassOnlyOptions"
                         :questionText="DamageGlassOnlyQuestion"
@@ -94,7 +94,7 @@
                     <textboxQuestion
                         inputId="phoneNumberField"
                         cmsWidgetName="PhoneNumberQuestion"
-                        v-model="phoneNumber"
+                        v-model="welcomePageModel.phoneNumber"
                         validationRules="phone-number-required|phone-number-format"
                         isRequired
                         ref="phoneNumber"
@@ -107,7 +107,7 @@
                     <textboxQuestion
                         inputId="emailField"
                         cmsWidgetName="EmailAddressQuestion"
-                        v-model="email"
+                        v-model="welcomePageModel.email"
                         ref="email"
                         validationRules="email-address-required|email-address-format"
                         isRequired
@@ -177,6 +177,7 @@
         mixins: [BaseFormMixin],
         data() {
             return {
+                welcomePageModel: {
                     policyNumber: "",
                     dateOfLoss: "",
                     damageCause: "",
@@ -185,6 +186,7 @@
                     isDamageGlassOnly: "",
                     phoneNumber: "",
                     email: ""
+                },
             };
         },
         setup() {
@@ -214,18 +216,7 @@
         methods:
         {
             async forwardButtonAction() {
-                const welcomePageModel = JSON.stringify({
-                    PolicyNumber: this.policyNumber,
-                    DateOfLoss: this.dateOfLoss,
-                    DamageCause: this.damageCause,
-                    DamageState: this.damageState,
-                    DamageCity: this.damageCity,
-                    IsDamageGlassOnly: this.isDamageGlassOnly,
-                    PhoneNumber: this.phoneNumber,
-                    Email: this.email
-                });
-                
-                this.mainStore.updatePolicyData(welcomePageModel);
+                this.mainStore.updatePolicyData(this.welcomePageModel);
                 return this.navigateForward();
             },
 
diff --git a/src/store/index.js b/src/store/index.js
index e092afae..91a8f887 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -41,7 +41,7 @@ const getDefaultState = () => {
         moldingQuestionAnswers: null,
         capabilityQuestionAnswers: null,
       },
-      policy:{
+      policy: {
         policyNumber: null,
         dateOfLoss: null,
         damageCause: null,
@@ -647,15 +647,14 @@ export const useMainStore = defineStore({
       },
       updatePolicyData(welcomePageModel)
       {
-        const welcomePageData = JSON.parse(welcomePageModel);
-        this.order.policy.policyNumber = welcomePageData.PolicyNumber;
-        this.order.policy.dateOfLoss = welcomePageData.DateOfLoss;
-        this.order.policy.damageCause = welcomePageData.DamageCause;
-        this.order.policy.damageState = welcomePageData.DamageState;
-        this.order.policy.damageCity = welcomePageData.DamageCity;
-        this.order.policy.isDamageGlassOnly = welcomePageData.IsDamageGlassOnly;
-        this.order.policy.phoneNumber = welcomePageData.PhoneNumber;
-        this.order.policy.email = welcomePageData.Email;
+        this.order.policy.policyNumber = welcomePageModel?.policyNumber;
+        this.order.policy.dateOfLoss = welcomePageModel?.dateOfLoss;
+        this.order.policy.damageCause = welcomePageModel?.damageCause;
+        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;
       },
       savePartQuestionAnswers(partQuestionAnswersArray) {
         // if part question answers have changed, reset subsequent question answers