diff --git a/templates/customer/cmb.form.html.twig b/templates/customer/cmb.form.html.twig
index e417f3bb..c979b7d7 100644
--- a/templates/customer/cmb.form.html.twig
+++ b/templates/customer/cmb.form.html.twig
@@ -663,9 +663,18 @@
 
 			// display create vehicle form
 			$("#add-vehicle").click(function() {
-				$("#vehicle-form").data('mode', 'create');
-				$("#vehicle-form-title").html("Add Vehicle");
-				$("#vehicle-form-modal").modal('show');
+                                // check if there are already 2 vehicles in list
+                                if (vehicleRows.length == 2)
+                                {
+                                    swal({
+                                        text: 'Customer is limited to only 2 vehicles..',
+                                        type: 'info',
+                                    });
+                                } else {
+				    $("#vehicle-form").data('mode', 'create');
+				    $("#vehicle-form-title").html("Add Vehicle");
+				    $("#vehicle-form-modal").modal('show');
+                                }
 			});
 
 			// find vehicle row by index