diff --git a/src/Controller/HubController.php b/src/Controller/HubController.php
index 21c4758d..74c05a7a 100644
--- a/src/Controller/HubController.php
+++ b/src/Controller/HubController.php
@@ -161,6 +161,8 @@ class HubController extends Controller
             ->setRiderSlots($req->request->get('rider_slots', 0))
             ->setHubViewFlag($req->request->get('flag_hub_view', false))
             ->setNotifNumber($req->request->get('notif_number'))
+            ->setAutoAssignHub($req->request->get('flag_hub_auto_assign', false))
+            ->setAutoAssignRider($req->request->get('flag_rider_auto_assign', false))
             ->clearPaymentMethods();
 
         // set payment methods
diff --git a/src/Entity/Hub.php b/src/Entity/Hub.php
index 2d98ea7f..c76f35bc 100644
--- a/src/Entity/Hub.php
+++ b/src/Entity/Hub.php
@@ -247,7 +247,7 @@ class Hub
         return $this;
     }
 
-    public function setAutoAssignHubFlag($flag_hub_auto_assign = true)
+    public function setAutoAssignHub($flag_hub_auto_assign = true)
     {
         $this->flag_hub_auto_assign = $flag_hub_auto_assign;
         return $this;
@@ -258,7 +258,7 @@ class Hub
         return $this->flag_hub_auto_assign;
     }
 
-    public function setAutoAssignRiderFlag($flag_rider_auto_assign = true)
+    public function setAutoAssignRider($flag_rider_auto_assign = true)
     {
         $this->flag_rider_auto_assign = $flag_rider_auto_assign;
         return $this;
diff --git a/templates/hub/form.html.twig b/templates/hub/form.html.twig
index 3c8947c1..324a396b 100644
--- a/templates/hub/form.html.twig
+++ b/templates/hub/form.html.twig
@@ -118,6 +118,22 @@
                                             </label>
                                         </span>
                                     </div>
+                                    <div class="col-lg-3">
+                                        <span class="m-switch m-switch--icon block-switch">
+                                            <label>
+                                                <input type="checkbox" name="flag_hub_auto_assign" id="status-open" value="1"{{ obj.isAutoAssignHub ? ' checked' }}>
+                                                <label class="switch-label">Hub Auto-Assign</label>
+                                                <span></span>
+                                            </label>
+                                        </span>
+                                        <span class="m-switch m-switch--icon block-switch">
+                                            <label>
+                                                <input type="checkbox" name="flag_rider_auto_assign" id="status-open" value="1"{{ obj.isAutoAssignRider ? ' checked' }}>
+                                                <label class="switch-label">Rider Auto-Assign</label>
+                                                <span></span>
+                                            </label>
+                                        </span>
+                                    </div>
                                 </div>
                                 <div class="form-group m-form__group row no-border">
                                     <div class="col-lg-3">