diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 7335c512..ab3ae1b5 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -352,6 +352,12 @@ class JobOrder
      */
     protected $responsible_party;
 
+    // rider plate number since rider can change vehicles
+    /**
+     * @ORM\Column(type="string", length=10)
+     */
+    protected $rider_plate_num;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -1013,4 +1019,16 @@ class JobOrder
         return $this->responsible_party;
     }
 
+    public function setRiderPlateNum($rider_plate_num)
+    {
+        $this->rider_plate_num = $rider_plate_num;
+        return $this;
+    }
+
+    public function getRiderPlateNum()
+    {
+        return $this->rider_plate_num;
+    }
+
+
 }
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index c004e479..769459d2 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -632,7 +632,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setHub($hub)
                 ->setRider($rider)
                 ->setPriority($priority)
-                ->setResponsibleParty($req->request->get('responsible_party', ''));
+                ->setResponsibleParty($req->request->get('responsible_party', ''))
+                ->setRiderPlateNum($req->request->get('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 d6d5ba20..3b08ac4a 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -333,6 +333,12 @@
                                             <label data-field="delivery_instructions">{% trans %}delivery_instructions_label{% endtrans %}</label>
                                             <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
                                         </div>
+                                        <br>
+                                        <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 class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
@@ -1035,6 +1041,7 @@ $(function() {
 
                     // clear rider field
                     $('#rider-field').val('');
+                    $('#rider-plate-number').val('');
                     selected_rider = '';
 
                     // get riders of hub
@@ -1084,6 +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);
             });
         {% endif %}
     });