diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index b26b95c8..ac001767 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -269,7 +269,7 @@
                                                                         <div class="col-g-3">
                                                                             <span class="m-switch m-switch--icon block-switch">
                                                                                 <label>
-                                                                                    <input type="checkbox" name="flag_motolite_battery" id="flag-motolite-battery" value="1" disabled>
+                                                                                    <input type="checkbox" name="flag_motolite_battery" id="flag-motolite-battery" value="1" {{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.hasMotoliteBattery ? ' checked' }} disabled>
                                                                                     <label class="switch-label">This vehicle is using a Motolite battery</label>
                                                                                     <span></span>
                                                                                 </label>
@@ -1381,6 +1381,7 @@ $(function() {
                 $("#flag-motolite-battery").prop("checked", true);
             } else {
                 $("#current-battery, #warranty-code, #warranty-expiration").val("No current battery").css('color', '#f4516c');
+                $("#flag-motolite-battery").prop("checked", false);
             }
         })
     }).focus();