diff --git a/src/store/index.js b/src/store/index.js
index d976710ce..b101d0524 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,7 +48,7 @@ const getDefaultState = () => {
       referralNumber: null,
       referralDate: null,
       referralCorrelationId: null,
-      parentAccountNumber: null,
+      parentAccountNumber: 0,
     },
     applicationUser: {
       eventBus: [],
@@ -192,7 +192,7 @@ export const mutations = {
     state.order.damage.numberOfChips = orderInformation.numberOfChips;
     state.order.lineItems.glassParts = orderInformation.parts;
     state.order.parentAccountNumber = orderInformation.parentAccountNumber;
-    state.order.serviceLocation.zipCode = orderInformation.zipCode;   // TODO CSR-416 Make sure this is correct
+    state.order.serviceLocation.zipCode = orderInformation.zipCode;
   }
 }