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 af307c5..d4c2b34 100644
--- a/src/app/user-management/change-password/change-password.component.html
+++ b/src/app/user-management/change-password/change-password.component.html
@@ -30,14 +30,14 @@
                                                                         {{ 'OldPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="d-flex flex-column w-100">
+                                                                    <div class="password-wrapper position-relative w-100">
                                                                         <div class="d-flex flex-row align-items-stretch">
                                                                         <input type="text" id="OldPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType}}"
                                                                             placeholder="{{ 'OldPassword' | translate }}" appNoWhitespaces
                                                                             />
-                                                                             <app-password-hide-show #psh [showPassword]="true" (onEyeClick)="togglePasswordType()"></app-password-hide-show>
+                                                                             <app-password-hide-show #psh class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType()"></app-password-hide-show>
                                                                        </div>
                                                                         <!-- <div class="text-danger">
                                                                             {{ 'requiredField' | translate }}
@@ -52,16 +52,16 @@
                                                                         {{ 'EnterNewPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="d-flex flex-column w-100">
-                                                                        <div class="d-flex flex-row align-items-stretch">
+                                                                    <div class="password-wrapper position-relative w-100">
+                                                                        
                                                                             <input id="EnterNewPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType1}}"
                                                                             maxlength="500"
                                                                             placeholder="{{ 'EnterNewPassword' | translate }}" appNoWhitespaces
                                                                             rows="3"  />
-                                                                            <app-password-hide-show #psh1 [showPassword]="true" (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
-                                                                        </div>
+                                                                            <app-password-hide-show #psh1 class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
+                                                                       
                                                                         
                                                                     </div>
                                                                 </div>
@@ -75,13 +75,13 @@
                                                                         {{ 'ConfirmPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="d-flex flex-column w-100">
-                                                                        <div class="d-flex flex-row align-items-stretch"><input type="text" id="ConfirmPassword"
+                                                                    <div class="password-wrapper position-relative w-100">
+                                                                       <input id="ConfirmPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType2}}"
                                                                             
                                                                             placeholder="{{ 'ConfirmPassword' | translate }}" appNoWhitespaces/>
-                                                                            <app-password-hide-show #psh2 [showPassword]="true" (onEyeClick)="togglePasswordType2()"></app-password-hide-show></div>
+                                                                            <app-password-hide-show class="password-eye align-items-stretch" #psh2 [showPassword]="true" (onEyeClick)="togglePasswordType2()"></app-password-hide-show>
                                                                         <!-- <div class="text-danger">
                                                                              <div>
                                                                                     {{ 'requiredField' | translate }}