diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index dde00cb9a..ae89a61e6 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -360,7 +360,7 @@ export default {
                 }
             }
             // If vin already exists, navigate directly to vin-lookup
-            else if (store.getters.vehicle.vin && store.getters.vehicle.vin.length === 17) {
+            else if (store.getters.vehicle.vin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_VIN,
                     this.$route
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index a6b902c09..96c4ffb90 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -15,7 +15,7 @@
                             v-model="vin"
                             customInputId="vin"
                             isRequired
-                            validationRules="vin-required|vin-format"
+                            :validationRules="!vinPopulatedOnPageLoad ? 'vin-required|vin-format' : ''"
                             :isDisabled="vinPopulatedOnPageLoad"
                             maxLength="17"
                             :mask="vinMask"