diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 2530327c2..bd1ce8fe2 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -711,7 +711,7 @@ export default {
 }
 .date-picker {
     position: relative;
-    flex-grow: 1;
+    flex-grow: 0;
     display: flex;
     flex-direction: column;
 
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 3dfd462cf..fe3b00320 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -338,12 +338,10 @@ export default {
                 false
             );
             await this.dispatchStoreAction(
-                storeActions.SAVE_SERVICE_LOCATION,
+                storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                 {
-                    address: this.customerQuestions.addressQuestions.streetAddress,
-                    city: this.customerQuestions.addressQuestions.city,
-                    zipCode: this.serviceZipCode,
                     state: resultMap.serviceZipValidationResponse.state,
+                    zipCode: this.serviceZipCode,
                     zipCodeCtu: resultMap.serviceZipValidationResponse.zipCodeCtu,
                 },
                 false
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 2f3a3797e..c0b1f1788 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -350,37 +350,22 @@ export default {
             // If a VIN has already been found. Validate the Service Zip (in case of changes)
             const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
 
-            // Check if Service Zip entered is serviceable then save the ZIP info and email address
+            // Check if Service Zip entered is serviceable then save the ZIP info
             if (zipCodeData.isServiceable) {
-                //Only save the service location if the zip changed or we lack zipCodeCtu
+                //Only save the zipCode, state, and zipCodeCtu if the zip changed or we lack zipCodeCtu
                 if (
                     this.$store.getters.order.serviceLocation.zipCode != this.serviceZipCode ||
                     !this.$store.getters.order.serviceLocation.zipCodeCtu
                 ) {
-                    const vehicleRegistrationInfo = this.$store.getters.vehicle.registration;
-                    if (vehicleRegistrationInfo.zipCode == this.serviceZipCode) {
-                        await this.dispatchStoreAction(
-                            storeActions.SAVE_SERVICE_LOCATION,
-                            {
-                                address: vehicleRegistrationInfo.address,
-                                city: vehicleRegistrationInfo.city,
-                                state: vehicleRegistrationInfo.state,
-                                zipCode: vehicleRegistrationInfo.zipCode,
-                                zipCodeCtu: zipCodeData.zipCodeCtu,
-                            },
-                            false
-                        );
-                    } else {
-                        await this.dispatchStoreAction(
-                            storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
-                            {
-                                state: zipCodeData.state,
-                                zipCode: this.serviceZipCode,
-                                zipCodeCtu: zipCodeData.zipCodeCtu,
-                            },
-                            false
-                        );
-                    }
+                    await this.dispatchStoreAction(
+                        storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
+                        {
+                            state: zipCodeData.state,
+                            zipCode: this.serviceZipCode,
+                            zipCodeCtu: zipCodeData.zipCodeCtu,
+                        },
+                        false
+                    );
                 }
 
                 await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);