diff --git a/src/app/user-management/setup-user/setup-user.component.html b/src/app/user-management/setup-user/setup-user.component.html
index 01baac9..e1d4d39 100644
--- a/src/app/user-management/setup-user/setup-user.component.html
+++ b/src/app/user-management/setup-user/setup-user.component.html
@@ -203,9 +203,10 @@
                                   <div
                                     class="password-wrapper position-relative w-100"
                                   >
-                                    <input
+                                  <div class="password-wrapper">
+                                     <input
                                       id="defaultPassword"
-                                      type="password"
+                                      [type]="passwordType"
                                       class="form-control"
                                       formControlName="defaultPassword"
                                       name="defaultPassword"
@@ -214,7 +215,10 @@
                                       }}"
                                       appNoWhitespaces
                                     />
+                                    <app-password-hide-show #passShowSetupUser class="password-eye align-items" [showPassword]="true"
+                                        (onEyeClick)="toggleSetupPass()"></app-password-hide-show>
 
+                                  </div>                                 
                                     <div
                                       class="text-danger"
                                       *ngIf="
diff --git a/src/app/user-management/setup-user/setup-user.component.ts b/src/app/user-management/setup-user/setup-user.component.ts
index 9164ea5..e34164d 100644
--- a/src/app/user-management/setup-user/setup-user.component.ts
+++ b/src/app/user-management/setup-user/setup-user.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,11 +15,12 @@ import { HttpURIService } from '../../app.http.uri.service';
 import { I18NService } from '../../services/i18n.service';
 import { SuccessMessages, ErrorMessages } from '../../utils/enums';
 import { ResetPasswordModalComponent } from '../reset-password-modal/reset-password-modal.component';
+import { PasswordHideShowComponent } from '../../shared/components/password-hide-show/password-hide-show.component';
 
 @Component({
   selector: 'app-setup-user',
   standalone: true,
-  imports: [TranslateModule, ReactiveFormsModule, FormsModule, CommonModule, NgSelectModule, TableFilterPipe, ResetPasswordModalComponent],
+  imports: [TranslateModule, ReactiveFormsModule, FormsModule, CommonModule, NgSelectModule, TableFilterPipe, ResetPasswordModalComponent, PasswordHideShowComponent],
   templateUrl: './setup-user.component.html',
   styleUrl: './setup-user.component.scss'
 })
@@ -39,7 +40,7 @@ export class SetupUserComponent implements OnInit {
   renewalDataExpanded: boolean = true;
   totalCount: number = 0;
   mode: 'create' | 'edit' = 'create';
-
+  passwordType: string = 'password';
   userSetupDataExpanded: boolean = true;
   buttonPermissions: any;
   isLoading: boolean = false;
@@ -52,6 +53,7 @@ export class SetupUserComponent implements OnInit {
     { label: 'Admin', value: 'ADMIN' },
     { label: 'User', value: 'USER' },
   ];
+    @ViewChild('passShowSetupUser') passwordHideShow?: PasswordHideShowComponent;
 
   constructor(
     private fb: FormBuilder,
@@ -61,6 +63,9 @@ export class SetupUserComponent implements OnInit {
     private i18nService: I18NService
   ) {}
 
+  toggleSetupPass() {
+    this.passwordType = this.passwordHideShow?.showPassword ? 'password' : 'text';
+  }
   onSearch(value: string): void {
     this.searchText = value;
   }
diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json
index 95e6c6a..7acb14a 100644
--- a/src/assets/i18n/English.json
+++ b/src/assets/i18n/English.json
@@ -234,6 +234,7 @@
     "next": "Next",
     "LOGIN_SUCCESSFULLY":"Login SucessFully",
     "RESET_PASSWORD_SUCCESS":"Password Reset Successfully",
+    "RESET_PASSWORD_FAILED":"New password cannot be the same as previous password",
     "CHANGE_PASSWORD_SUCCESS":"Password Changed Successfully",
     "ALREADY_LOGGED_IN": "User Already Logged In",
     "ACCESS_DENIED" : "Access Denied",