diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 394eb0cc8..cbbfe0323 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -127,7 +127,7 @@ export default {
             displayVinLookupByHomeAddressNotAllowedAlert: false,
             previouslyEnteredCarId: "",
             isCarIdDifferent: false,
-            isSelectedGlassAvailableForVehicle: false,
+            isSelectedGlassAvailableForVehicle: true,
             customAlertData: {},
             displayInvalidZipAlert: false,
             showServiceZipField: this.getServiceZipFromStore(),
@@ -230,9 +230,6 @@ export default {
                 const carFound = carsFound[0].vehicle;
 
                 this.isCarIdDifferent = carFound.carId !== this.$store.getters.vehicle.carId;
-console.log(this.isCarIdDifferent);
-console.log(carFound.carId);
-console.log(this.$store.getters.vehicle.carId);
                 if (this.isCarIdDifferent && carFound.carId !== this.previouslyEnteredCarId) {
                     // Display Alert
                     this.previouslyEnteredCarId = carFound.carId;
@@ -261,7 +258,6 @@ console.log(this.$store.getters.vehicle.carId);
 
             } else {
 				// No VINS found.
-                console.log("no vins");
                 this.displayVinNotFoundAlert = true;
                 return this.$refs.funnelFooter.removeLoader();
 
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 38dea789d..b0669e720 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -125,8 +125,8 @@ export default {
       // Map API result data, to address-vehicles data structure
       const mappedData = this.VehiclesFromApi.map((v) => {
         const maskSymbol = "X";
-        const vinStart = maskSymbol.repeat(v.vin.length-4);
-        const vinEnd = v.vin.substring(v.vin.length-4);
+        const vinStart = maskSymbol.repeat(v.vin.length - 6);
+        const vinEnd = v.vin.substring(v.vin.length - 6);
         return {
           vin: v.vin,
           vehicle: v.vehicle,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 0db677496..667bac7fc 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -163,7 +163,7 @@ export default {
       displayVinNotFoundAlert: false,
       displayMatchedDifferentVehicleAlert: false,
       previouslyEnteredCarId: "",
-      isSelectedGlassAvailableForVehicle: false,
+      isSelectedGlassAvailableForVehicle: true,
       isCarIdDifferent: false,
       customAlertData: {},
       displayInvalidZipAlert: false, 
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5a7a2c560..4ba6a9fe9 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -178,7 +178,7 @@ export default {
       customAlertData: {},
       previouslyEnteredCarId: '',
       vinPopulatedOnPageLoad: this.getVinFromStore()?.length > 0,
-      isSelectedGlassAvailableForVehicle: false,
+      isSelectedGlassAvailableForVehicle: true,
       displayInvalidZipAlert: false,
       displayNonServiceableZipAlert: false,
       displayVinNotFoundAlert: false,