diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index edddc3f1..dad6a8d4 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -277,13 +277,13 @@ class JobOrderController extends Controller
                 $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]);
                 $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]);
                 // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]);
-                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]);
+                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
                 $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
             }
             else
             {
                 // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]);
-                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]);
+                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
                 $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
                 $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]);
             }
@@ -1037,12 +1037,12 @@ class JobOrderController extends Controller
         return $this->render($template, $params);
     }
 
-    public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler)
+    public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id)
     {
         $this->denyAccessUnlessGranted('jo_walkin.edit', null, 'No access.');
 
         $error_array = [];
-        $error_array = $jo_handler->processOneStepJobOrder($req, $id);
+        $error_array = $jo_handler->processWalkinJobOrder($req, $id);
 
         // check if any errors were found
         if (!empty($error_array)) {
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index d109d4c3..2e16f2e9 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -2997,8 +2997,16 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         }
     }
 
-    public function getEditRoute()
+    public function getEditRoute($jo_id)
     {
-        return 'jo_onestep_edit_form';
+        $jo = $this->em->getRepository(JobOrder::class)->find($jo_id);
+        if (empty($jo))
+            throw new NotFoundHttpException('The item does not exist');
+
+        // check transaction origin
+        if ($jo->getSource() == TransactionOrigin::WALK_IN)
+            return 'jo_walkin_edit_form';
+        else
+            return 'jo_onestep_edit_form';
     }
 }
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index f2e02e44..667d84e3 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -347,7 +347,7 @@
                                             </label>
                                         {% endif %}
                                         <div class="form-control-feedback hide" data-field="hub"></div>
-                                        <input type="hidden" id="hub-field" name="hub_id" value="">
+                                        <input type="hidden" id="hub-field" name="hub_id" value="{{ obj.getHub ? obj.getHub.getID : "" }}">
                                         <div class="table-frame" data-name="hub">
                                             <table id="hubs-table" class="table table-compact table-hover table-clickable m-table">
                                                 <thead>
@@ -557,7 +557,7 @@ function get_vehicle_makes(mfg_id, vid = 0) {
 
 $(function() {
     var form_in_process = false;
-    var selected_hub = '';
+    var selected_hub = '{{ obj.getHub ? obj.getHub.getID : "" }}';
 
     $(function() {
         $('#hubs-table').on('click', 'tr', function() {
@@ -592,11 +592,6 @@ $(function() {
     // add invoice items to data
     fields['invoice_items'] = invoiceItems;
 
-    {% if mode in ['update-processing', 'update-reassign-hub'] %}
-    // add selected hub to data
-        fields['hub'] = selectedHub;
-    {% endif %}
-
     e.preventDefault();
 
     $.ajax({