diff --git a/src/store/index.js b/src/store/index.js
index d64571c17..a7b3420a9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -189,6 +189,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
   }
 }
 
@@ -374,7 +375,7 @@ export const actions = {
           style: vehicle.style,
         },
         numberOfChips: damage.numberOfChips,
-        zipCode: 43215,    // TODO CSR-416, should not be hardcoded
+        zipCode: 43215,    // TODO CSR-416, should not be hardcoded (state.order.serviceLocation.zipCode)
         glassToReplace: damage.glassToReplace,
         referralNumber: context.state.order.referralNumber,
         referralDate: context.state.order.referralDate