diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php
index b0d72494..9a56eaa5 100644
--- a/app/Views/newClientModal.php
+++ b/app/Views/newClientModal.php
@@ -149,8 +149,13 @@
     
         // If GST is currently validating, wait for it to complete
         if (isGSTValidating) {
-            toastr.info('Please wait while we validate your GST number...', 'Validating');
-            return;
+            if($('#Owner_type').val() ==  1){
+                toastr.info('Please wait while we validate your GST number...', 'Validating');
+                return;
+            }else if ($('#client_type').val() ==  1){
+                toastr.info('Please wait while we validate your GST number...', 'Validating');
+                return;
+            }
         }
         
         // If GST validation failed, prevent submission
@@ -228,19 +233,17 @@
                     if(form_type != 1){
 
                         setTimeout(function(){
+
                             $('#client_id').val(res.client_id).change();
                             $('#client_id').prepend($('<option>', {
                                 value: 'add_client',
                                 text: '+ Add Client'
                             }));
+
                             setTimeout(function(){
                                 $('#client_branch_id').val(res.branch_id).change();
-                                // try {
-                                //     setTimeout(function () {(res.branch_id)},1000);
-                                // }catch (e) {
-                                //     console.error('Error calling getBranchData:', e); // optional logging
-                                // }
                             }, 1000)
+                            
                         }, 2000)
 
                     }else{
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 3fbce33c..ad4f430c 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -3604,10 +3604,11 @@ $('#client_type').change(function() {
         $('#name').prop('required', false);
         $('#mobile').prop('required', false);
         $('#gst').prop('required', false);
+        $('#email').prop('required', false);
 
         $('#dob').prop('required', true);
         $('#phone').prop('required', true);
-        $('#email').prop('required', true);
+        $('#email2').prop('required', true);
         $('#aadhar').prop('required', true);
 
         $('#owner_branch').prop('required', false);
@@ -3630,10 +3631,11 @@ $('#client_type').change(function() {
         $('#name').prop('required', true);
         $('#mobile').prop('required', true);
         $('#gst').prop('required', true);
+         $('#email').prop('required', true);
 
         $('#dob').prop('required', false);
         $('#phone').prop('required', false);
-        $('#email').prop('required', false);
+        $('#email2').prop('required', false);
         $('#aadhar').prop('required', false);
 
         $('#owner_branch').prop('required', true);