diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index c5246ddb..acd88d56 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -206,17 +206,17 @@
                                 <div class="form-group m-form__group row">
                                     <div class="col-lg-3">
                                         <label data-field="current_battery">Current Battery</label>
-                                        <input type="text" name="current_battery" id="current-battery" class="form-control m-input" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" data-vehicle-field="1" disabled>
+                                        <input type="text" name="current_battery" id="current-battery" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" data-vehicle-field="1" disabled>
                                         <div class="form-control-feedback hide" data-field="current_battery"></div>
                                     </div>
                                     <div class="col-lg-3">
                                         <label data-field="warranty_code">Serial Number</label>
-                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
+                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
                                         <div class="form-control-feedback hide" data-field="warranty_code"></div>
                                     </div>
                                     <div class="col-lg-3">
                                         <label data-field="warranty_expiration">Warranty Expiration Date</label>
-                                        <input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" value="{{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") : '' }}" data-vehicle-field="1" disabled>
+                                        <input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") : '' }}" data-vehicle-field="1" disabled>
                                         <div class="form-control-feedback hide" data-field="warranty_expiration"></div>
                                     </div>
                                 </div>
@@ -1270,6 +1270,7 @@ $(function() {
             $('.cust_field').val('');
             $('.cv_field').val('');
             $('#cv-make').val('');
+            $('.battery_field').val('');
         } else {
             $('.cust_field').prop('disabled', true);
             $('.cv_field').prop('disabled', true);
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index 667d84e3..a72973bd 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -206,17 +206,17 @@
                                 <div class="form-group m-form__group row">
                                     <div class="col-lg-3">
                                         <label data-field="current_battery">Current Battery</label>
-                                        <input type="text" name="current_battery" id="current-battery" class="form-control m-input" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" data-vehicle-field="1" disabled>
+                                        <input type="text" name="current_battery" id="current-battery" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle and obj.getCustomerVehicle.getCurrentBattery ? obj.getCustomerVehicle.getCurrentBattery.getManufacturer.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getModel.getName ~ ' ' ~ obj.getCustomerVehicle.getCurrentBattery.getSize.getName ~ ' (' ~ obj.getCustomerVehicle.getCurrentBattery.getProductCode ~ ')' }}" data-vehicle-field="1" disabled>
                                         <div class="form-control-feedback hide" data-field="current_battery"></div>
                                     </div>
                                     <div class="col-lg-3">
                                         <label data-field="warranty_code">Serial Number</label>
-                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
+                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
                                         <div class="form-control-feedback hide" data-field="warranty_code"></div>
                                     </div>
                                     <div class="col-lg-3">
                                         <label data-field="warranty_expiration">Warranty Expiration Date</label>
-                                        <input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" value="{{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") : '' }}" data-vehicle-field="1" disabled>
+                                        <input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input battery_field" value="{{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") : '' }}" data-vehicle-field="1" disabled>
                                         <div class="form-control-feedback hide" data-field="warranty_expiration"></div>
                                     </div>
                                 </div>
@@ -806,6 +806,7 @@ var vdata = false;
             $('.cust_field').val('');
             $('.cv_field').val('');
             $('#cv-make').val('');
+            $('.battery_field').val('');
         } else {
             $('.cust_field').prop('disabled', true);
             $('.cv_field').prop('disabled', true);