diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 718c70ee..7335c512 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -346,6 +346,12 @@ class JobOrder
      */
     protected $date_status_change;
 
+    // insurer/responsible party handling the onsite job
+    /**
+     * @ORM\Column(type="string", length=80, nullable=true)
+     */
+    protected $responsible_party;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -996,4 +1002,15 @@ class JobOrder
         return $this->jo_extra;
     }
 
+    public function setResponsibleParty($responsible_party)
+    {
+        $this->responsible_party = $responsible_party;
+        return $this;
+    }
+
+    public function getResponsibleParty()
+    {
+        return $this->responsible_party;
+    }
+
 }
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 57094a1c..9ffb102a 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -629,7 +629,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setLandmark($req->request->get('landmark'))
                 ->setHub($hub)
                 ->setRider($rider)
-                ->setPriority($priority);
+                ->setPriority($priority)
+                ->setResponsibleParty($req->request->get('responsible_party', ''));
 
             $jo->addMeta('discount', $discount);
             $jo->addMeta('service_charges', $service_charges);
@@ -2707,7 +2708,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setDeliveryAddress('Walk-in')
                 ->setLandmark('Walk-in')
                 ->setCoordinates($hub_coordinates)
-                ->setHub($hub);
+                ->setHub($hub)
+                ->setResponsibleParty($req->request->get('responsible_party', ''));
 
             $jo->addMeta('discount', $discount);
 
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 2b01fbad..d6d5ba20 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -335,6 +335,11 @@
                                         </div>
                                     </div>
                                     <div class="col-lg-6">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label>Responsible Party</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>
                                         <div class="col-lg-12 form-group-inner">
                                             <label>Prepared By</label>
                                             <input type="text" name="created_by" class="form-control m-input" value="{{ obj.getCreatedBy.getFullName|default('') }}" disabled>
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index 58b52900..f0769f18 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -332,13 +332,19 @@
                                             </select>
                                             <div class="form-control-feedback hide" data-field="mode_of_payment"></div>
                                         </div>
-                                    </div>
-                                    <div class="col-lg-6">
+                                        <br>
                                         <div class="col-lg-12 form-group-inner">
                                             <label>Prepared By</label>
                                             <input type="text" name="created_by" class="form-control m-input" value="{{ obj.getCreatedBy.getFullName|default('') }}" disabled>
                                             <div class="form-control-feedback hide" data-field="date_transaction"></div>
                                         </div>
+                                    </div>
+                                    <div class="col-lg-6">
+                                        <div class="col-lg-12 form-group-inner">
+                                            <label>Responsible Party</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>
                                         <br>
                                     </div>
                                 </div>