diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index daaadb9f..d2a32ac1 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -114,13 +114,11 @@ class UserController extends AdminController
                 // Employee Code
                 // ======================
                 'emp_code' => [
-                    'rules'  => 'required|alpha_numeric|min_length[3]|max_length[20]|is_unique[user_profiles.emp_code,id,{PrimaryKey}]',
+                    'rules'  => 'required|min_length[3]|max_length[15]',
                     'errors' => [
                         'required'      => 'Employee Code is required',
-                        'alpha_numeric' => 'Employee Code must be alphanumeric',
                         'min_length'    => 'Employee Code must be at least 3 characters',
-                        'max_length'    => 'Employee Code cannot exceed 20 characters',
-                        'is_unique'     => 'Employee Code already exists'
+                        'max_length'    => 'Employee Code cannot exceed 15 characters',
                     ]
                 ],
 
@@ -141,11 +139,10 @@ class UserController extends AdminController
                 // Email
                 // ======================
                 'email' => [
-                    'rules'  => 'required|valid_email|is_unique[user_profiles.email,id,{PrimaryKey}]',
+                    'rules'  => 'required|valid_email',
                     'errors' => [
                         'required'    => 'Email is required',
                         'valid_email' => 'Please enter a valid email address',
-                        'is_unique'   => 'Email already exists'
                     ]
                 ],
 
@@ -153,11 +150,10 @@ class UserController extends AdminController
                 // Mobile
                 // ======================
                 'mobile' => [
-                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]|is_unique[user_profiles.mobile,id,{PrimaryKey}]',
+                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]',
                     'errors' => [
                         'required'     => 'Mobile number is required',
                         'regex_match'  => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
-                        'is_unique'    => 'Mobile number already exists'
                     ]
                 ],
 
@@ -302,13 +298,11 @@ class UserController extends AdminController
                 // Employee Code
                 // ======================
                 'emp_code' => [
-                    'rules'  => 'required|alpha_numeric|min_length[3]|max_length[20]|is_unique[user_profiles.emp_code,id,{PrimaryKey}]',
+                    'rules'  => 'required|min_length[3]|max_length[15]',
                     'errors' => [
                         'required'      => 'Employee Code is required',
-                        'alpha_numeric' => 'Employee Code must be alphanumeric',
                         'min_length'    => 'Employee Code must be at least 3 characters',
-                        'max_length'    => 'Employee Code cannot exceed 20 characters',
-                        'is_unique'     => 'Employee Code already exists'
+                        'max_length'    => 'Employee Code cannot exceed 15 characters',
                     ]
                 ],
 
@@ -329,11 +323,10 @@ class UserController extends AdminController
                 // Email
                 // ======================
                 'email' => [
-                    'rules'  => 'required|valid_email|is_unique[user_profiles.email,id,{PrimaryKey}]',
+                    'rules'  => 'required|valid_email',
                     'errors' => [
                         'required'    => 'Email is required',
                         'valid_email' => 'Please enter a valid email address',
-                        'is_unique'   => 'Email already exists'
                     ]
                 ],
 
@@ -341,11 +334,10 @@ class UserController extends AdminController
                 // Mobile
                 // ======================
                 'mobile' => [
-                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]|is_unique[user_profiles.mobile,id,{PrimaryKey}]',
+                    'rules'  => 'required|regex_match[/^[6-9][0-9]{9}$/]',
                     'errors' => [
                         'required'     => 'Mobile number is required',
                         'regex_match'  => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
-                        'is_unique'    => 'Mobile number already exists'
                     ]
                 ],
 
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 28cde270..ca47296c 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -581,7 +581,7 @@ table.dataTable tbody td {
                 
                 <div class="form-group text-right m-b-0">
                     <button class="btn app-btn-outline-secondary  mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
-                    <button class="btn app-btn-secondary  waves-effect waves-light" id="btnSubmit">Submit</button>
+                    <button type="submit" class="btn app-btn-secondary  waves-effect waves-light" id="btnSubmit">Submit</button>
                     <!-- <button type="button" class="btn btn-secondry waves-effect waves-light mr-1" data-dismiss="modal" aria-hidden="true">Close</button> -->
                 </div>
             </form>
@@ -884,7 +884,20 @@ table.dataTable tbody td {
         </table>
     </div>
 </div>
+<?php if (session()->getFlashdata('error')) : ?>
+    <?php foreach (session()->getFlashdata('error') as $error) : ?>
+        <script>
+            toastr.error("<?= esc($error) ?>", "Validation Error");
+        </script>
+    <?php endforeach; ?>
 
+    <script>
+        var errorModal = new bootstrap.Modal(
+            document.getElementById('con-close-modal')
+        );
+        errorModal.show();
+    </script>
+<?php endif; ?>
 <script>
     var table;
     $(document).ready(function () {
@@ -1899,19 +1912,36 @@ table.dataTable tbody td {
 </script>
 
 <script>
-    $(document).on('click', '#btnAdd', function(){
-        $('#first_name').val('');
-        $('#last_name').val('');
-        $('#email').val('');
-        $('#mobile').val('');
-        $('#emp_code').val('');        
-        $('#nhance_branch_id').val('0');        
-        $('#rm_id').val('0');        
+    $(document).on('click', '#btnAdd', function() {
+        // Reset the form
+        $('#UserForm')[0].reset(); 
+        $('#UserId').val('');
+        
+        // Specifically reset Select2 if you are using it
+        $('#nhance_branch_id').val('').trigger('change');
+        $('#rm_id').val('').trigger('change');
+        
+        // Update Modal Title and Action
+        $('.modal-title').text('Add User');
+        $('#btnSubmit').text('Submit');
         $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
-        let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
-        myModal.show();  // open modal
-
+        
+        var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+        myModal.show();
     });
+
+    // $(document).on('click', '#btnAdd', function(){
+    //     $('#first_name').val('');
+    //     $('#last_name').val('');
+    //     $('#email').val('');
+    //     $('#mobile').val('');
+    //     $('#emp_code').val('');        
+    //     $('#nhance_branch_id').val('0');        
+    //     $('#rm_id').val('0');        
+    //     $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
+    //     let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+    //     myModal.show();  // open modal
+    // });
     $(document).on('click', '#btnNhancePartnerAdd', function(){
         $('#partner_name').val('');
         $('#email_addr').val('');