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 663e705..7b66156 100644
--- a/src/app/user-management/change-password/change-password.component.html
+++ b/src/app/user-management/change-password/change-password.component.html
@@ -96,8 +96,8 @@
                                                                         {{ 'oldPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="password-wrapper position-relative w-100">
-                                                                        <div class="d-flex flex-row align-items-stretch">
+                                                                    <div class="w-100">
+                                                                        <div class="password-wrapper">
                                                                         <input type="text" id="oldPassword"
                                                                             class="form-control"
                                                                             formControlName="oldPassword"
@@ -105,7 +105,8 @@
                                                                             placeholder="{{ 'oldPassword' | translate }}" appNoWhitespaces
                                                                             />
                                                                              <app-password-hide-show #psh class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType()"></app-password-hide-show>
-                                                                       </div>
+                                                                             </div>
+                                                                      
                                                                         <div class="text-danger" *ngIf="changePasswordForm.get('oldPassword')?.touched &&
                                                                                       changePasswordForm.get('oldPassword')?.invalid">
                                                                             {{ 'fieldRequired' | translate }}
@@ -120,22 +121,19 @@
                                                                         {{ 'enterNewPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="password-wrapper position-relative w-100">
-                                                                        
-                                                                            <input id="newPassword"
-                                                                            class="form-control"
-                                                                            formControlName="newPassword"
-                                                                            type="{{passwordType1}}"
-                                                                            maxlength="500"
-                                                                            placeholder="{{ 'enterNewPassword' | translate }}" appNoWhitespaces
-                                                                            rows="3"  />
-                                                                            <app-password-hide-show #psh1 class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
-                                                                       
-                                                                        
-                                                                    </div>
-                                                                    <div class="text-danger" *ngIf="newPasswordError$">
+                                                                    <div class="w-100">
+                                                                        <div class="password-wrapper">
+                                                                        <input id="newPassword" class="form-control" formControlName="newPassword" type="{{passwordType1}}" maxlength="500"
+                                                                            placeholder="{{ 'enterNewPassword' | translate }}" appNoWhitespaces rows="3" />
+                                                                        <app-password-hide-show #psh1 class="password-eye align-items-stretch" [showPassword]="true"
+                                                                            (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
+                                                                            </div>
+                                                                    
+                                                                    
+                                                                        <div class="text-danger" *ngIf="newPasswordError$">
                                                                             {{ newPasswordError$ | translate }}
                                                                         </div>
+                                                                    </div>
                                                                 </div>
                                                             </div>
 
@@ -147,22 +145,19 @@
                                                                         {{ 'confirmPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
-                                                                    <div class="password-wrapper position-relative w-100">
-                                                                        
-                                                                            <input id="confirmPassword"
-                                                                            class="form-control"
-                                                                            formControlName="confirmPassword"
-                                                                            type="{{passwordType2}}"
-                                                                            maxlength="500"
-                                                                            placeholder="{{ 'confirmPassword' | translate }}" appNoWhitespaces
-                                                                            rows="3"  />
-                                                                            <app-password-hide-show #psh2 class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType2()"></app-password-hide-show>
-                                                                       
-                                                                        
-                                                                    </div>
-                                                                    <div class="text-danger" *ngIf="confirmPasswordError$">
+                                                                    <div class="w-100">
+                                                                        <div class="password-wrapper">
+                                                                        <input id="confirmPassword" class="form-control" formControlName="confirmPassword" type="{{passwordType2}}"
+                                                                            maxlength="500" placeholder="{{ 'confirmPassword' | translate }}" appNoWhitespaces rows="3" />
+                                                                        <app-password-hide-show #psh2 class="password-eye align-items-stretch" [showPassword]="true"
+                                                                            (onEyeClick)="togglePasswordType2()"></app-password-hide-show>
+                                                                            </div>
+                                                                    
+                                                                        <div class="text-danger" *ngIf="confirmPasswordError$">
                                                                             {{ confirmPasswordError$ | translate }}
                                                                         </div>
+                                                                    </div>
+                                                                    
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-6">