diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index e57f8114..da10aede 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -200,11 +200,33 @@
                                         </div>
                                     </div>
                                     <div class="col-lg-3">
-                                        {% if is_granted('customer.dpa') %}
-                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa-consent" value="1"{{ obj.getCustomer ? obj.getCustomer.isDpaConsent ? ' checked' }} >
-                                            <label class="switch-label">With DPA Consent</label>
-                                            <div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
-                                        {% endif %}
+                                        <div class="col-lg-12 form-group-inner">
+                                            <div class="m-checkbox-list">
+                                                <label class="m-checkbox">
+                                                    {% if is_granted('customer.dpa') %}
+                                                        <input type="checkbox" name="flag_dpa_consent" id="flag-dpa-consent" value="1"{{ obj.getCustomer ? obj.getCustomer.isDpaConsent ? ' checked' }} >
+                                                        With DPA Consent
+                                                        <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
+                                                    {% endif %}
+                                                </label>
+                                                <label class="m-checkbox">
+                                                    {% if obj.getCustomer %}
+                                                        hi
+                                                        {% if obj.getCustomer.getCustomerTags is empty %}
+                                                            <input type="checkbox" name="flag_car_club_member" id="flag-car-club-member" value="1" disabled>
+                                                        {% else %}
+                                                            <input type="checkbox" name="flag_car_club_member" id="flag-car-club-member" value="1" checked disabled>
+                                                        {% endif %}
+                                                    {% else %}
+                                                        <input type="checkbox" name="flag_car_club_member" id="flag-car-club-member" value="1" disabled>
+                                                    {% endif %}
+                                                    Car Club Member
+                                                    <span></span>
+                                                    <div class="form-control-feedback hide" data-field="flag_car_club_member"></div>
+                                                </label>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="col-lg-3">
                                         <div class="col-lg-12 form-group-inner">
@@ -1489,6 +1511,8 @@ $(function() {
                         checkboxes[x].checked = false;
                     }
                 }
+
+                $("#flag-car-club-member").prop("checked", true);
             }
 
             // set hidden customer id
@@ -1542,6 +1566,7 @@ $(function() {
         for (var x = 0; checkboxes.length > x; x++)
         {
             checkboxes[x].checked = false;
+            $("#flag-car-club-member").prop("checked", false);
         }
     }