diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index d2788578..b83853fc 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -596,6 +596,10 @@ class ClientController extends AdminController
             $policy_type = $this->request->getPost('policy_type');
             $client_id = $this->request->getPost('client_id');
             $client_policy_id = $this->request->getPost('client_policy_id');
+            if(!empty($client_id) && $client_id != null){
+                $client_policy_data = $this->clientPolicyModel->where('id', $client_policy_id)->first();
+                $client_id =  $client_policy_data['client_id'];
+            }
             $policy_grid_id = $this->request->getPost('policy_grid_id');
             $si_or_bp = $this->request->getPost('si_or_bp');
             $basic_multiplier = str_replace(',', '', $this->request->getPost('basic_multiplier'));
diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php
index 278938f6..562b3ae1 100644
--- a/app/Views/client_basic_info.php
+++ b/app/Views/client_basic_info.php
@@ -203,8 +203,11 @@ $(document).ready(function () {
                 $('#policy_PrimaryKey').val(res.data.id);
                 $('#client_id_kyc').val(res.data.id);
                 $('#kyc_PrimaryKey').val(res.data.id);
+                $('#Client_id').val(res.data.id);
                 $('#entity_type').val(res.data.entity_type_id);
 
+
+                var client_id_for_file = res.data.id;
                 console.log()
 
                 if(PrimaryKey === ''){
@@ -226,7 +229,7 @@ $(document).ready(function () {
                                             <td id="form_${item.id}" style=""><form class="ajax" ><input class="file-input__input" type="file" name="file_name">
                                                 <input type="hidden" class="form-control" value="<?= csrf_hash() ?>" name="<?= csrf_token() ?>" />
                                                 <input type="hidden" class="form-control" value="${item.id}" name="kyc_doc_type_id" />
-                                                <input type="hidden" name="client_id" value="<?= isset($client['id']) ? $client['id'] : '' ?>"/>
+                                                <input type="hidden" name="client_id" value="${client_id_for_file}"/>
                                                 <button class="btn btn-sm btn-primary submit" style="position: relative;right: 80px;">Submit</button></form></td>
                                             <td id="name_${item.id}" style="display:none;"></td>
                                             <td><i data-id="${item.id}" class="mdi mdi-delete btnKycDelete"  style="font-size:18px;"></i></td>
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 0fdda4d3..5f8e1cef 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -294,10 +294,10 @@
                                 <div class="btn-group dropdown">
                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     <div class="dropdown-menu dropdown-menu-right">
-                                        <a href="#" data-id="${item.id}"        class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                        <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                         <a href="#" data-id="${item.id}" class="dropdown-item btnPolicyMaster" data-toggle="modal" id="${item.policy_type_id}"><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                         <a href="#" data-id="${item.id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rac Rate</a>                    
-                                        <a href="#" data-id="${item.id}" class="dropdown-item btnOpenEnroll"><i class="mdi mdi-file-lock mr-2 text-muted font-18 vertical-middle"></i>Open Enrollment</a>                    
+                                        <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnOpenEnroll"><i class="mdi mdi-file-lock mr-2 text-muted font-18 vertical-middle"></i>Open Enrollment</a>                    
                                     </div>
                                 </div>
                             </td>