diff --git a/src/Controller/RiderController.php b/src/Controller/RiderController.php
index db986ee3..84e2f21d 100644
--- a/src/Controller/RiderController.php
+++ b/src/Controller/RiderController.php
@@ -147,6 +147,16 @@ class RiderController extends BaseController
         return $this->render('rider/form.html.twig', $params);
     }
 
+    protected function setObject($obj, $req)
+    {
+        $obj->setFirstName($req->request->get('first_name'))
+            ->setLastName($req->request->get('last_name'))
+            ->setContactNumber($req->request->get('contact_no'))
+            ->setPlateNumber($req->request->get('plate_number'))
+            ->setImageFile($req->request->get('image_file'))
+            ->setActive($req->request->get('flag_active') ? true : false);
+    }
+
     public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator)
     {
         $this->denyAccessUnlessGranted('rider.add', null, 'No access.');
@@ -161,11 +171,7 @@ class RiderController extends BaseController
         $obj = new Rider();
 
         // set and save values
-        $obj->setFirstName($req->request->get('first_name'))
-            ->setLastName($req->request->get('last_name'))
-            ->setContactNumber($req->request->get('contact_no'))
-            ->setPlateNumber($req->request->get('plate_number'))
-            ->setImageFile($req->request->get('image_file'));
+        $this->setObject($obj, $req);
 
         // initialize error list
         $error_array = [];
@@ -292,11 +298,7 @@ class RiderController extends BaseController
             throw $this->createNotFoundException('The item does not exist');
 
         // set and save values
-        $obj->setFirstName($req->request->get('first_name'))
-            ->setLastName($req->request->get('last_name'))
-            ->setContactNumber($req->request->get('contact_no'))
-            ->setPlateNumber($req->request->get('plate_number'))
-            ->setImageFile($req->request->get('image_file'));
+        $this->setObject($obj, $req);
 
         // initialize error list
         $error_array = [];
diff --git a/templates/rider/form.html.twig b/templates/rider/form.html.twig
index 708bcefd..c6501ca9 100644
--- a/templates/rider/form.html.twig
+++ b/templates/rider/form.html.twig
@@ -76,6 +76,18 @@
 										<div class="form-control-feedback hide" data-field="hub"></div>
 									</div>
 								</div>
+								<div class="form-group m-form__group row no-border">
+									<div class="col-lg-12">
+										<span class="m-switch m-switch--icon block-switch">
+											<label>
+												<input type="checkbox" name="flag_active" id="flag_active" value="1"{{ obj.isActive() ? ' checked' }}>
+												<label class="switch-label">Active</label>
+												<span></span>
+											</label>
+										</span>
+										<div class="form-control-feedback hide" data-field="enabled"></div>
+									</div>
+								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
 										<label data-field="image_file">