diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 69fa5c16..de732501 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -2012,8 +2012,8 @@ class ClientController extends AdminController
         $sanitized_post_data['policy_type_id']    = $sanitized_post_data['policy_type_id'] ?? null;
 
         
-        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d')  ?? null;
-        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null;
+        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date']  ?? null, 'd-m-Y', 'Y-m-d')  ?? null;
+        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date']  ?? null, 'd-m-Y', 'Y-m-d') ?? null;
         
         $sanitized_post_dataa['base_policy']                        = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy'];
         $sanitized_post_data['policy_status']                      = 1;
@@ -2022,9 +2022,9 @@ class ClientController extends AdminController
         
         
         
-        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0;
-        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ? 1 : 0;
-        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ? 1 : 0;
+        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ?? null ? 1 : 0;
+        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ?? null ? 1 : 0;
+        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ?? null ? 1 : 0;
         $sanitized_post_data['wellness_vendor_id']                 = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null;
 
 
@@ -2046,12 +2046,12 @@ class ClientController extends AdminController
         }
 
 
-        $sanitized_post_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d');
-        $sanitized_post_data['policy_end_date']   = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'] ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_end_date']   = change_date_format($sanitized_post_data['policy_end_date'] ?? null, 'd-m-Y', 'Y-m-d');
         $sanitized_post_data['policy_no'] = $sanitized_post_data['policy_no'] ?? null;
         if ($sanitized_post_data['inception_type'] == 2) {
-            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d');
-            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'] ?? null, 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'] ?? null, 'd-m-Y', 'Y-m-d');
             // $data['reminder_date']   = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d');
             $sanitized_post_data['reminder_date']   = $sanitized_post_data['reminder_date'] ?? null;
         } else {
@@ -2066,7 +2066,7 @@ class ClientController extends AdminController
         if ($insert) {
             $clientPoliceData =  $this->clientPolicyModel->getClientPolicyByClientId($sanitized_post_data['client_id']);
             $clientPoliceData['role'] = get_role_id();
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'method' => 'CERATE', 'post_data' => $insert_data], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'client_id' => $client_id, 'method' => 'CERATE', 'post_data' => $insert_data], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
         }
@@ -2109,8 +2109,8 @@ class ClientController extends AdminController
         $sanitized_post_data['no_of_lives']                        = $sanitized_post_data['no_of_lives']  ?? null;
         $sanitized_post_data['policy_status']                      = $sanitized_post_data['policy_status']  ?? null;
         $sanitized_post_data['no_of_employees']                    = $sanitized_post_data['no_of_employees']  ?? null;
-        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d') ?? null;
-        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null;
+        $sanitized_post_data['earned_premium_date']                = change_date_format($sanitized_post_data['earned_premium_date'] ?? null, 'd-m-Y', 'Y-m-d') ?? null;
+        $sanitized_post_data['claims_incurred_date']               = change_date_format($sanitized_post_data['claims_incurred_date']  ?? null, 'd-m-Y', 'Y-m-d') ?? null;
         $sanitized_post_data['incurred_claims_ratio']              = $sanitized_post_data['incurred_claims_ratio']  ?? null;
         $sanitized_post_data['no_lives_at_inception']              = $sanitized_post_data['no_lives_at_inception']  ?? null;
         $sanitized_post_data['premium_paid_at_inception']          = $sanitized_post_data['premium_paid_at_inception']  ?? null;
@@ -2119,23 +2119,23 @@ class ClientController extends AdminController
         $sanitized_post_data['claims_incurred_amount']             = $sanitized_post_data['claims_incurred_amount']  ?? null;
         $sanitized_post_data['base_policy']                        = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy'];
         $sanitized_post_data['policy_status']                      = 1;
-        $sanitized_post_data['inception_type']                     = $sanitized_post_data['inception_type'] ? 2 : 1;
-        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ? 1 : 0;
+        $sanitized_post_data['inception_type']                     = $sanitized_post_data['inception_type'] ?? null ? 2 : 1;
+        $sanitized_post_data['enrolment_visibility']               = $sanitized_post_data['enrolment_visibility'] ?? null ? 1 : 0;
         $sanitized_post_data['client_branch_id']                   = $sanitized_post_data['client_branch_id']  ?? null;
         $sanitized_post_data['cd_ac_pk']                           = $sanitized_post_data['cd_ac_no']  ?? null;
         $sanitized_post_data['gst']                                = $sanitized_post_data['gst']  ?? null;
         $sanitized_post_data['disclaimer']                         = $sanitized_post_data['disclaimer']  ?? null;
-        $sanitized_post_data['policy_start_date']                  = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d');
-        $sanitized_post_data['policy_end_date']                    = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d');
-        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0;
-        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ? 1 : 0;
+        $sanitized_post_data['policy_start_date']                  = change_date_format($sanitized_post_data['policy_start_date']  ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['policy_end_date']                    = change_date_format($sanitized_post_data['policy_end_date']  ?? null, 'd-m-Y', 'Y-m-d');
+        $sanitized_post_data['is_member_modify_allowed']           = $sanitized_post_data['is_member_modify_allowed'] ?? null ? 1 : 0;
+        $sanitized_post_data['is_lgbtq']                           = $sanitized_post_data['is_lgbtq'] ?? null ? 1 : 0;
         $sanitized_post_data['wellness_plan_id']                   = $sanitized_post_data['wellness_plan_id']  ?? null;
         $sanitized_post_data['wellness_vendor_id']                 = $sanitized_post_data['wellness_vendor_id']  ?? null;
         $sanitized_post_data['wellness_vendor_id']                 = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null;
 
         if ($sanitized_post_data['inception_type'] == 2) {
-            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d');
-            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'] ?? null, 'd-m-Y', 'Y-m-d');
+            $sanitized_post_data['close_date']   = change_date_format($sanitized_post_data['close_date'] ?? null, 'd-m-Y', 'Y-m-d');
             // $sanitized_post_data['reminder_date']   = change_date_format($sanitized_post_data['reminder_date'), 'd-m-Y', 'Y-m-d');
             $sanitized_post_data['reminder_date']   = $sanitized_post_data['reminder_date']  ?? null;
         } else {
@@ -2181,7 +2181,7 @@ class ClientController extends AdminController
                 ]]);
             }
 
-            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'method' => 'EDIT'], 200);
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $clientPoliceData, 'client_id' => $client_id, 'method' => 'EDIT'], 200);
         } else {
             return $this->respond(['status' => false, 'code' => 404, 'message' => 'no data found'], 200);
         }
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 398a0faf..af1c7aa6 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -825,6 +825,13 @@ input:checked + .slider_blue::before {
                 $('#open_date').val('');
                 $('#close_date').val('');
                 $('#policy').html('<option value="" selected>Select Policy</option>');
+
+                const urlParams = new URLSearchParams(window.location.search);
+                const clientPolicyId = urlParams.get('client_policy_id');
+                if (clientPolicyId) {
+                    let client_url = '<?= base_url('client/list/') ?>' + res.client_id ;
+                    window.location.href = client_url
+                }
             },
             error: function(xhr, status, error) {
                 console.error(xhr.responseText);
@@ -852,11 +859,6 @@ input:checked + .slider_blue::before {
             },
             complete :function(){
                 $('#opening_bal').val("")
-                const hash = window.location.hash;
-                if (hash === '#police-tab') {
-                    let client_url = '<?= base_url('client/list/') ?>' + res.client_id ;
-                    window.location.href = client_url
-                }
                 console.log('AJAX request completed');
             }
         });