diff --git a/src/store/index.js b/src/store/index.js
index c8a915c70..dd047e6eb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3302,16 +3302,16 @@ export const actions = {
         }
         //Optional for specific YMMSs
         switch (context.state.order.vehicle.make.toLowerCase()) {
-            case "mercedes benz":
-            case "volkswagen":
             case "audi":
             case "porsche":
                 return true;
             default:
         }
         if (
-            context.state.order.vehicle.make.toLowerCase() === "bmw" &&
-            context.state.order.vehicle.year <= 2017
+            (context.state.order.vehicle.make.toLowerCase() === "bmw" &&
+                context.state.order.vehicle.year < 2010) ||
+            (context.state.order.vehicle.make.toLowerCase() === "volkswagen" &&
+                context.state.order.vehicle.year < 2010)
         )
             return true;
 
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 2119f1e8b..7eef5d77a 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -4242,10 +4242,10 @@ describe("isVinOptionalVehicle", () => {
     const testVehicles = [
         ["2017", "acura", false],
         ["2018", "bmw", false],
-        ["2017", "bmw", true],
-        ["2016", "bmw", true],
-        ["2016", "mercedes benz", true],
-        ["2016", "volkswagen", true],
+        ["2009", "bmw", true],
+        ["2016", "bmw", false],
+        ["2016", "mercedes benz", false],
+        ["2016", "volkswagen", false],
         ["2016", "audi", true],
         ["2016", "porsche", true],
     ];