diff --git a/src/store/index.js b/src/store/index.js
index 96cda682..648832b9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -65,6 +65,7 @@ const getDefaultState = () =>
                 }
             },
             // FMG only has email
+            // CSR-1358 and CSR-1359
             customer: {
                 address: {
                     streetAddress: null,
@@ -92,11 +93,11 @@ const getDefaultState = () =>
                 otherParts: null, // TODO what is this?
                 supportingItems: null,
                 vaps: null,
-                serverData: null // TODO what is this for and should it be added?
+                serverData: null // TODO add
             },
             // Add parent account number from FMG
             payment: {
-                isInsurance: true,
+                isInsurance: true, // TODO delete; irrelevant to ISS
                 insuranceCoverage: {
                     isVerified: false,
                     coverageStatus: coverageStatuses.PENDING
@@ -121,8 +122,7 @@ const getDefaultState = () =>
             },
             referralNumber: null,
             referralDate: null,
-            referralCorrelationId: null, // TODO when is this set
-            eon: null // TODO what is this
+            eon: null // TODO add
         },
         applicationUser: {
             experiments: [],
@@ -717,7 +717,7 @@ export const useMainStore = defineStore({
                         experiments: applicationUser.experiments,
                         lastPage: applicationUser.lastPageVisited,
                         pageData: applicationUser.pageData,
-                        savedSessionId: applicationUser.savedSessionId,
+                        savedSessionId: applicationUser.savedSessionId
                     },
                     order: {
                         // done
@@ -735,8 +735,8 @@ export const useMainStore = defineStore({
                                 city: vehicle.registration.city,
                                 state: vehicle.registration.state,
                                 zipCode: vehicle.registration.zipCode,
-                                licensePlateNumber: vehicle.registration.licensePlate,
-                            },
+                                licensePlateNumber: vehicle.registration.licensePlate
+                            }
                         },
                         // done
                         damage: {
@@ -745,14 +745,14 @@ export const useMainStore = defineStore({
                             isRepair: damage.isRepair,
                             partQuestionAnswers: order.damage.partQuestionAnswers,
                             moldingQuestionAnswers: order.damage.moldingQuestionAnswers,
-                            capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers,
+                            capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers
                         },
                         customer: {
-                            emailAddress: order.customer.emailAddress,
-                            firstName: order.customer.firstName,
-                            lastName: order.customer.lastName,
-                            phoneNumber: order.customer.phone, // TODO contact info or customer?
-                            optInSms: order.contactInfo.requestTextUpdates
+                            emailAddress: order.contactInfo.emailAddress ?? order.customer.emailAddress,
+                            firstName: order.contactInfo.firstName ?? order.customer.firstName,
+                            lastName: order.contactInfo.lastName ?? order.customer.lastName,
+                            phoneNumber: order.contactInfo.phoneNumber ?? order.customer.phoneNumber, // TODO contact info or customer?
+                            optInSms: order.contactInfo.requestTextUpdates ?? false
                         },
                         lineItems: {
                             glassParts: lineItems.glassParts,