diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index ab3ae1b5..d1cf59b9 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -354,7 +354,7 @@ class JobOrder
 
     // rider plate number since rider can change vehicles
     /**
-     * @ORM\Column(type="string", length=10)
+     * @ORM\Column(type="string", length=10, nullable=true)
      */
     protected $rider_plate_num;
 
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 0b2a9b57..ff3b8014 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -467,6 +467,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';
         }
 
+        // check if responsible party is present
+        if (empty($req->request->get('responsible_party')))
+            $error_array['responsible_party'] = 'Responsible party is required.';
+
         // check if new customer
         if ($req->request->get('new_customer', false))
         {
@@ -553,6 +557,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // check if hub AND rider is selected
+        $rider_plate_number = '';
         if ((empty($req->request->get('hub_id'))) &&
             (empty($req->request->get('rider_id')))) {
             $error_array['hub'] = 'No hub selected.';
@@ -575,15 +580,16 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                         // check if rider is still available
                         if (!($rider->isAvailable()))
                             $error_array['rider'] = 'Selected rider is unavailable.';
+
+                        $rider_plate_number = $rider->getPlateNumber();
                     }
                 }
             }
         }
 
-        // get rider plate number from rider
-        $rider_plate_number = '';
-        if ($rider != null)
-            $rider_plate_number = $rider->getPlateNumber();
+        // delivery address
+        if (empty($req->request->get('delivery_address')))
+            $error_array['delivery_address'] = 'Delivery address is required.';
 
         // get discount and set to meta
         $discount = $req->request->get('invoice_discount');
@@ -2600,6 +2606,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $jo = new JobOrder();
         }
 
+        // check if responsible party is present
+        if (empty($req->request->get('responsible_party')))
+            $error_array['responsible_party'] = 'Responsible party is required.';
+
         // check if new customer
         if ($req->request->get('new_customer', false))
         {
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 945b9e0f..549a7478 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -342,7 +342,10 @@
                                     </div>
                                     <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
-                                            <label>Responsible Party</label>
+                                            <label>
+                                                Responsible Party
+                                                <span style="color:red"> *</span>
+                                            </label>
                                             <input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" >
                                             <div class="form-control-feedback hide" data-field="responsible_party"></div>
                                         </div>
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index f0769f18..c39d33dd 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -341,7 +341,10 @@
                                     </div>
                                     <div class="col-lg-6">
                                         <div class="col-lg-12 form-group-inner">
-                                            <label>Responsible Party</label>
+                                            <label>
+                                                Responsible Party
+                                                <span style="color:red"> *</span>
+                                            </label>
                                             <input type="text" name="responsible_party" class="form-control m-input" value="{{ obj.getResponsibleParty|default('') }}" >
                                             <div class="form-control-feedback hide" data-field="responsible_party"></div>
                                         </div>