diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index bb3e6126..16fc7c34 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -87,8 +87,8 @@ export default {
       activeVehicleLookupAlertType: null,
       needToLookupVehicle: true,
       vehicleFromLookup: null,
-      vin: null,
-      vinPopulatedOnPageLoad: this.mainStore.vehicle.vin?.length > 0,
+      vin: this.getVinFromStore(),
+      vinPopulatedOnPageLoad: this.getVinFromStore()?.length > 0,
     };
   },
   provide() {
@@ -122,6 +122,7 @@ export default {
     },
     vinMask() {
       if (this.vinPopulatedOnPageLoad) {
+          this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.PERFECT_MATCH;
           const lastSixChars = this.vin.substring(11, this.vin.length);
           return `!X!X!X!X!X!X!X!X!X!X!X${lastSixChars}`;
       } else {
@@ -133,9 +134,9 @@ export default {
     arePagePrerequisiteValid() {
       return true;
     },
-    // getVinFromStore() {
-    //   return this.mainStore.vehicle.vin;
-    // },
+    getVinFromStore() {
+      return this.mainStore.vehicle.vin;
+    },
     backButtonAction() {
       /**
        * this.navigationScenarios comes from base-mixin