diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 95fe4d80..b710a183 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -487,10 +487,6 @@ class LeadsController extends BaseController
         // print_r($rules); die;
 
         if ((int) $this->request->getPost('lead_form_type') === 2) {
-            $rules['client_type'] = [
-                'rules'  => 'required',
-                'errors' => ['required' => 'Client Type is required'],
-            ];
             $rules['policy_type_id'] = [
                 'rules'  => 'required',
                 'errors' => ['required' => 'Policy Type is required'],
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index 9ece0333..e305b1f0 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -302,13 +302,13 @@
                                     </div>
 
                                     <div class="form-group col-md-4">
-                                        <label for="client_branch">Branch Name<span class="text-danger">*</span></label>
+                                        <label for="branch_name">Branch Name<span class="text-danger">*</span></label>
                                         <input type="text" class="form-control" id="branch_name" name="branch_name"
                                             placeholder="Enter Branch Name" required>
                                     </div>
 
                                     <div class="form-group col-md-4">
-                                        <label for="client_branch">Branch Code<span class="text-danger">*</span></label>
+                                        <label for="branch_code">Branch Code<span class="text-danger">*</span></label>
                                         <input type="text" class="form-control" id="branch_code" name="branch_code"
                                             placeholder="Enter Branch Code" required>
                                     </div>
@@ -321,7 +321,7 @@
                                     </div>
 
                                     <div class="form-group col-md-4 freshFields">
-                                        <label for="client_branch">Contact Person Name<span class="text-danger">*</span></label>
+                                        <label for="contact_person_name">Contact Person Name<span class="text-danger">*</span></label>
                                         <input type="text" class="form-control" id="contact_person_name" name="contact_person_name"
                                             placeholder="Enter Contact Name" required>
                                     </div>
@@ -401,7 +401,7 @@
                                     </div>
 
                                     <div class="form-group col-md-4">
-                                        <label for="">Next Reminder Date<span class="text-danger"></span></label>
+                                        <label for="next_reminder_date">Next Reminder Date<span class="text-danger"></span></label>
                                         <div class="input-icon">
                                             <input type="text" class="form-control" id="next_reminder_date" name="next_reminder_date" placeholder="DD/MM/YYYY">
                                             <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
@@ -1243,7 +1243,7 @@
             </div>
             
             <div class="form-group col-md-4">
-                <label for="">Date of Commencement <span class="text-danger">*</span></label>
+                <label for="policy_start_date">Date of Commencement <span class="text-danger">*</span></label>
                 <div class="input-icon">
                         <input type="text" class="form-control policy_start_date" id="policy_start_date_${increment}" name="policy_start_date[]" placeholder="Enter DOC" onchange="calculatePolicyMetrics(this)">
                         <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
@@ -1252,7 +1252,7 @@
             </div>
 
             <div class="form-group col-md-4">
-                <label for="">Date of Expiry <span class="text-danger">*</span></label>
+                <label for="policy_end_date">Date of Expiry <span class="text-danger">*</span></label>
                 <div class="input-icon">
                             <input type="text" class="form-control policy_end_date" id="policy_end_date_${increment}" name="policy_end_date[]" placeholder="Enter DOE">
                             <i class="mdi mdi-calendar-blank-outline additional-icon"></i>
diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php
index bc70d874..3d40798d 100644
--- a/app/Views/newClientModal.php
+++ b/app/Views/newClientModal.php
@@ -244,6 +244,10 @@
                     appendClients(res.clients, res.client_id);
                     appendBranch(res.branches, res.branch_id);
 
+                    $('#client_name').val($('#client_name_for_modal').val());
+                    $('#client_short_name').val($('#client_short_name_for_modal').val());
+                    $('#contact_person_name').val(res.data.name);
+
                     $('#gst').val(res.data.gst);
                     $('#branch_name').val(res.data.branch_name);
                     $('#branch_code').val(res.data.branch_code);
diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php
index 4dd3e6d1..906057e6 100644
--- a/app/Views/rfq/gmc.php
+++ b/app/Views/rfq/gmc.php
@@ -6,7 +6,7 @@
    <div class="form-row renewalCalculation">
 
        <div class="form-group col-md-3 renewalFields" style="display: none;">
-           <label for="incurred_claim_date">Incurred Claim Date<span class="text-danger"></span></label>
+           <label for="incurred_claim_date">Incurred Claim Date<span class="text-danger">*</span></label>
            <input value="<?= isset($lead_edit_data['incurred_claims_date']) ? $lead_edit_data['incurred_claims_date'] : '' ?>" type="text" class="form-control incurred_claim" id="incurred_claim_date<?= $increment  ?>"
                name="incurred_claim_date[]" placeholder="Enter DOE" oninput="calculatePolicyMetrics(this)">
        </div>