diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.html b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.html
index bc59449..600ed75 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.html
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.html
@@ -25,14 +25,17 @@
     </div>
 </div>
 
-<p-tabView [scrollable]="true">
+<p-tabView #tabView
+        [(activeIndex)]="activeIndex"
+        (onChange)="onTabChange($event, tabView)"
+        [scrollable]="true">
     <p-tabPanel header="General" leftIcon="pi pi-user">
-        <app-general [isActive]="!newEmployee" [employeeNo]="this.employeeService.hrEmployee.employeeNo" 
+        <app-general #general [isActive]="!newEmployee" [employeeNo]="this.employeeService.hrEmployee.employeeNo" 
             (defaultNationalityHandler)="defaultNationalityHandler($event)"
             (defaultEmployeeTypeHandler)="defaultEmployeeTypeHandler($event)"></app-general>
     </p-tabPanel>
      <p-tabPanel header="Contacts" leftIcon="pi pi-phone">
-        <app-contact (saveContact)="saveContact($event)"></app-contact>
+        <app-contact #contact (saveContact)="saveContact($event)"></app-contact>
     </p-tabPanel>
     <!-- <p-tabPanel header="Bangla" leftIcon="pi pi-star">
         <app-bangla></app-bangla>
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts
index d36bff0..51843b8 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { EmployeeServices } from '../../_services/employee/employee.service';
 import { empFileuploads, HrEmployee } from '../../_models/HREmployee/hrEmployee';
@@ -13,6 +13,8 @@ import { HRMNotificationService } from '../../app.notification.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { Nationality } from '../nationality/nationality';
 import { Category } from 'src/app/_models/Basic/category';
+import { GeneralComponent } from './general/general.component';
+import { ContactComponent } from './contact/contact.component';
 
 @Component({
     selector: 'app-employee-profile',
@@ -34,6 +36,14 @@ export class EmployeeProfileComponent implements OnInit {
     isDisplay = false;
     defaultNationality: Nationality;
     defaultEmployeeType: Category;
+
+    activeIndex: number = 0;
+    previousIndex: number = 0; // 👈 track the previous tab index manually
+    @ViewChild('general') generalComponent!: GeneralComponent;
+    @ViewChild('Contact') contactComponent!: ContactComponent;
+    newEmpSaved: boolean = false;
+
+
     constructor(private fb: FormBuilder,
         public employeeService: EmployeeServices,
         public basicService: BasicService,
@@ -326,5 +336,58 @@ export class EmployeeProfileComponent implements OnInit {
     defaultEmployeeTypeHandler(dataItem: Category) {
         this.defaultEmployeeType = dataItem;
     }
+
+    onTabChange(event: any, tabView: any) {
+        const nextIndex = event.index;
+        const currentIndex = this.previousIndex; // 👈 previous tab before switch
+
+        const currentTab = tabView.tabs[currentIndex];
+        const nextTab = tabView.tabs[nextIndex];
+
+        debugger
+        if (this.newEmployee) {
+
+            if (currentTab.header.toLowerCase() == 'general' && !this.newEmpSaved) {
+
+                setTimeout(() => {
+
+                    if (this.generalComponent.personalInfo.valid === false && this.generalComponent.hrEmployee.employeeNo === '') {
+                        this.notificationService.showError('Required Fields Can\'t Be Empty');
+                        this.activeIndex = currentIndex;
+                        this.previousIndex = currentIndex;
+                        return;
+                    }
+                    this.generalComponent.SavePersonalInfo();
+                    this.newEmpSaved = true;
+                    return;
+                });
+            }
+            if (currentTab.header.toLowerCase() == 'contacts') {
+                debugger
+                // this.contactComponent.ngOnInit();
+            }
+        }
+
+
+
+        console.log('Previous Tab:', currentIndex, currentTab.header);
+        console.log('Next Tab:', nextIndex, nextTab.header);
+
+        // // Example validation logic on current tab before switching
+        // if (currentIndex === 0 && this.form1.invalid) {
+        //   this.form1.markAllAsTouched();
+        //   setTimeout(() => (this.activeIndex = currentIndex)); // cancel switch
+        //   return;
+        // }
+
+        // if (currentIndex === 1 && this.form2.invalid) {
+        //   this.form2.markAllAsTouched();
+        //   setTimeout(() => (this.activeIndex = currentIndex)); // cancel switch
+        //   return;
+        // }
+
+        // ✅ Save current as previous after successful switch
+        this.previousIndex = nextIndex;
+    }
 }
 
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.ts
index 4cd265e..3c12a4a 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.ts
@@ -116,7 +116,7 @@ export class GeneralComponent implements OnInit {
     nationalities: Nationality[];
     defaultNationality: Nationality;
     defaultEmployeeType: Category;
-    nameBangla: string = 'asasas';
+    nameBangla: string = '';
     defaultPhoto = "assets/photos/profile-default.jpg";
     photoPath = "Documents/EMPPHOTO";
     isDisplay: boolean = false;
@@ -450,6 +450,7 @@ export class GeneralComponent implements OnInit {
     //     }
     // }
     SavePersonalInfo() {
+        debugger
         // console.log(this.hrEmployee.banglaName);
         // return;
         if (this.personalInfo.valid === false && this.hrEmployee.employeeNo === '') {