diff --git a/src/app/shared/components/side-nav/side-nav.component.html b/src/app/shared/components/side-nav/side-nav.component.html
index a4d7e2b..b8f4024 100644
--- a/src/app/shared/components/side-nav/side-nav.component.html
+++ b/src/app/shared/components/side-nav/side-nav.component.html
@@ -30,7 +30,7 @@
                         </a>
                     </li>
                     <li>
-                        <a  routerLink="/home/changePassword" routerLinkActive="mm-active" (click)="navigateToChangePassword()" style="cursor: pointer">
+                        <a  routerLink="/home/changePassword" routerLinkActive="mm-active" style="cursor: pointer">
                             <span> {{ 'changePassword' | translate }}</span>
                         </a>
                     </li>
diff --git a/src/app/shared/components/side-nav/side-nav.component.ts b/src/app/shared/components/side-nav/side-nav.component.ts
index eaa0d29..975a608 100644
--- a/src/app/shared/components/side-nav/side-nav.component.ts
+++ b/src/app/shared/components/side-nav/side-nav.component.ts
@@ -100,10 +100,5 @@ export class SideNavComponent {
       this.storageService.setItem('currentSubModule', lastRoutePart);
     }
   }
-
-  navigateToChangePassword() {
-  this.router.navigate(['/home/changePassword'], { 
-    state: { fromMenu: true } 
-  });
-}
+  
 }
diff --git a/src/app/user-management/change-password/change-password.component.html b/src/app/user-management/change-password/change-password.component.html
index 32f643f..219142f 100644
--- a/src/app/user-management/change-password/change-password.component.html
+++ b/src/app/user-management/change-password/change-password.component.html
@@ -59,6 +59,7 @@
                     </div>
                 </div>
             </div>
+            
             <div *ngIf="!isFirstLogin" class="full-width-page">
                <div class="row">
                     <div class="col-12">
diff --git a/src/app/user-management/change-password/change-password.component.ts b/src/app/user-management/change-password/change-password.component.ts
index c0a1770..4eae8cc 100644
--- a/src/app/user-management/change-password/change-password.component.ts
+++ b/src/app/user-management/change-password/change-password.component.ts
@@ -41,12 +41,16 @@ passwordType2: string = 'password';
   }
 
    ngOnInit(): void {
-    const fromMenu = history.state?.['fromMenu'];
-    if(fromMenu){
+    this.checkIfFirstTimeChangePasswordOrNot();
+  }
+
+  checkIfFirstTimeChangePasswordOrNot(){
+    let currentUser: any = JSON.parse(this.storageService.getItem('user')!)
+    if(currentUser.user.isFirstLogin){
+      this.isFirstLogin = true;
+    }
+    else{
       this.isFirstLogin = false;
-    }else{
-      const firstLoginFlag = this.storageService.getItem('firstLogin');
-      this.isFirstLogin = firstLoginFlag === 'true';
     }
   }