diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 67880513..72fd4883 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -1407,6 +1407,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $params['mode'] = 'onestep-edit';
         $params['cvid'] = $obj->getCustomerVehicle()->getID();
         $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
+        $params['jo_service_charges'] = $obj->getMeta('service_charges');
 
         $this->fillDropdownParameters($params);
         $this->fillFormTags($params);
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 3b87f59e..d58b707a 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -490,25 +490,25 @@
                                     </div>
                                 </div>
                                 <!-- TODO: loop through existing service charges for job order -->
-                                <!--
-                                <div class="form-group m-form__group row">
-                                    <div class="col-lg-6">
-                                        <div class="col-lg-12 form-group-inner">
-                                            <select class="form-control m-input sc-select" name="service_charges[]">
-                                                {% for key, sc in service_charges %}
-                                                    <option value="{{ key }} "obj.getSource == key ? ' selected' }}>{{ sc.getName }}</option>
-                                                {% endfor %}
-                                            </select>
+                                {% for jo_sc_key, jo_sc in jo_service_charges %}
+                                    <div class="form-group m-form__group row">
+                                        <div class="col-lg-6">
+                                            <div class="col-lg-12 form-group-inner">
+                                                <select class="form-control m-input sc-select" name="service_charges[]">
+                                                    {% for key, sc in service_charges %}
+                                                        <option value="{{ sc.getID }}"{{ jo_sc.id == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="col-lg-5">
-                                        <input class="form-control sc-amount" type="text" value="0" disabled>
-                                    </div>
-                                    <div class="col-lg-1">
-                                        <button class="btn btn-danger btn-sc-remove">X</button>
-                                    </div>
-                                </div>
-                                -->
+                                        <div class="col-lg-5">
+                                            <input class="form-control sc-amount" type="text" value="0" disabled>
+                                        </div>
+                                        <div class="col-lg-1">
+                                            <button class="btn btn-danger btn-sc-remove">X</button>
+                                        </div>
+		                    </div>
+                                {% endfor %}
                             </div>
 
                             <div class="m-form__seperator m-form__seperator--dashed"></div>