diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 769459d2..0b2a9b57 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -580,6 +580,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             }
         }
 
+        // get rider plate number from rider
+        $rider_plate_number = '';
+        if ($rider != null)
+            $rider_plate_number = $rider->getPlateNumber();
+
         // get discount and set to meta
         $discount = $req->request->get('invoice_discount');
 
@@ -633,7 +638,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setRider($rider)
                 ->setPriority($priority)
                 ->setResponsibleParty($req->request->get('responsible_party', ''))
-                ->setRiderPlateNum($req->request->get('rider_plate_number', ''));
+                ->setRiderPlateNum($rider_plate_number);
 
             $jo->addMeta('discount', $discount);
             $jo->addMeta('service_charges', $service_charges);
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 3b08ac4a..945b9e0f 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -334,11 +334,11 @@
                                             <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
                                         </div>
                                         <br>
-                                        <div class="col-lg-12 form-group-inner">
+                                        <!-- <div class="col-lg-12 form-group-inner">
                                             <label data-field="rider_plate_number">Rider Plate Number</label>
                                             <input type="text" id="rider-plate-number" name="rider_plate_number" class="form-control m-input" value="{{ obj.getRiderPlateNum|default('') }}" >
                                             <div class="form-control-feedback hide" data-field="rider_plate_number"></div>
-                                        </div>
+                                        </div>  -->
                                     </div>
                                     <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
@@ -1091,8 +1091,8 @@ $(function() {
                 // set rider
                 selected_rider = id;
                 $('#rider-field').val(selected_rider);
-                var rider_plate_num = $(this).find('td:nth-child(4)').text();
-                $('#rider-plate-number').val(rider_plate_num);
+                //var rider_plate_num = $(this).find('td:nth-child(4)').text();
+                //$('#rider-plate-number').val(rider_plate_num);
             });
         {% endif %}
     });