diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index 1175881d37..3fbd055da0 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -51,7 +51,12 @@
             </mat-form-field>
             <mat-form-field>
               <mat-label translate>common.password</mat-label>
-              <input id="password-input" matInput type="password" formControlName="password"/>
+              <input id="password-input" matInput [type]="hidePassword ? 'password' : 'text'" formControlName="password"/>
+	                   <button mat-icon-button matSuffix type="button"
+                         (click)="hidePassword = !hidePassword"
+                         [attr.aria-pressed]="hidePassword">
+                         <mat-icon>{{hidePassword ? 'visibility_off' : 'visibility'}}</mat-icon>
+                     </button>
               <mat-icon matPrefix>lock</mat-icon>
             </mat-form-field>
             <div fxLayoutAlign="end center" class="forgot-password">
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.ts b/ui-ngx/src/app/modules/login/pages/login/login.component.ts
index 2526cfe376..de66448c73 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.ts
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.ts
@@ -37,7 +37,8 @@ export class LoginComponent extends PageComponent implements OnInit {
     password: ''
   });
   oauth2Clients: Array<OAuth2ClientInfo> = null;
-
+  hidePassword = true;
+  
   constructor(protected store: Store<AppState>,
               private authService: AuthService,
               public fb: FormBuilder,