diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 371004dd5..5a7a2c560 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -302,23 +302,32 @@ export default {
       if (zipValidationResponse.data.isServiceable) {
         // If the Service Zip entered is serviceable then save the Zip Info and Email Address and navigate forward
         if (this.$store.getters.order.serviceLocation.zipCode != this.serviceZipCode) {
-          await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, {
-            zipCode: this.serviceZipCode,
-            state: zipValidationResponse.data.state
-          }, false);
+          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,
+              zipCode: vehicleRegistrationInfo.zipCode,
+              state: vehicleRegistrationInfo.state
+            }, false);
+          }
+          else {
+            await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, {
+              zipCode: this.serviceZipCode,
+              state: zipValidationResponse.data.state
+            }, false);
+          }
         }
 
         await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
 
         return await this.navigateForward();
-
       }
 
       // If the Service Zip is NOT serviceable then show an alert
       this.displayNonServiceableZipAlert = true;
 
       return this.$refs.funnelFooter.removeLoader();
-      
     },
     async navigateForward(){
       if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {