diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 511b7ed8..a03c4995 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -4,7 +4,6 @@
         <div class="fade-on-route-transition h-100">
             <siteHeader cmsWidgetName="SiteHeaderWidget"/>
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget"/>
-            <div class="body-container">
             <div class="row mt-4">
                 <div class="col">
                     <textboxQuestion
@@ -126,8 +125,7 @@
                         @ForwardClicked="forwardButtonAction" />
                 </div>
             </div>
-            </div>
-    </div>
+        </div>
     </div>
 </Form>
 </template>
@@ -337,23 +335,4 @@
 {
     margin-bottom: 0rem !important;
 }
-
-.p-2, body .page-container-grouped-styles{
-    padding:0 !important;
-}
-.site-header[data-v-0fe86b7b] {
-    padding: 0.5rem 0;
-}
-.subheader-primary{
-    margin-top:0.25rem;
-}
-
-.img-fluid{
-    width:162px;
-}
-.body-container
-{
-    padding-right: 1.5rem !important;
-    padding-left: 1.5rem !important; 
-}
 </style>
diff --git a/src/store/index.js b/src/store/index.js
index cd9e9ed1..c2b8142b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -83,7 +83,7 @@ const getDefaultState = () => {
       },
       referralNumber: null,
       referralDate: null,
-      accountNumber: 1,
+      accountNumber: 0,
     },
     applicationUser: {
       lastPageVisited: null,
@@ -362,7 +362,7 @@ export const useMainStore = defineStore({
         const carId = vehicle.carId;
         const glassArray = damage.glassToReplace;
         const resultsArray = damage.partQuestionAnswers;
-        const zipCode = order.serviceLocation.zipCode;
+        const zipCode = vehicle.registration.zipCode ? vehicle.registration.zipCode : order.customer.address.zipCode;
         const vin = vehicle.vin;
 
         // create a new array to avoid mutating state