diff --git a/ui-ngx/src/app/shared/components/button/toggle-password.component.html b/ui-ngx/src/app/shared/components/button/toggle-password.component.html
index 0f3843f65d..69301ce644 100644
--- a/ui-ngx/src/app/shared/components/button/toggle-password.component.html
+++ b/ui-ngx/src/app/shared/components/button/toggle-password.component.html
@@ -15,6 +15,6 @@
     limitations under the License.
 
 -->
-<button mat-icon-button (click)="togglePassword($event)" [attr.aria-pressed]="showPassword" *ngIf="!hideToggle">
+<button mat-icon-button type="button" (click)="togglePassword($event)" [attr.aria-pressed]="showPassword" *ngIf="!hideToggle">
   <mat-icon>{{ showPassword ? 'visibility' : 'visibility_off' }}</mat-icon>
 </button>
diff --git a/ui-ngx/src/app/shared/components/button/toggle-password.component.ts b/ui-ngx/src/app/shared/components/button/toggle-password.component.ts
index a4c4bb9aec..225f4ba023 100644
--- a/ui-ngx/src/app/shared/components/button/toggle-password.component.ts
+++ b/ui-ngx/src/app/shared/components/button/toggle-password.component.ts
@@ -24,13 +24,13 @@ import { AfterViewInit, Component, ElementRef } from '@angular/core';
 export class TogglePasswordComponent implements AfterViewInit {
   showPassword = false;
   hideToggle = false;
+
   private input: HTMLInputElement = null;
 
   constructor(private hostElement: ElementRef) { }
 
   togglePassword($event: Event) {
     $event.stopPropagation();
-    $event.preventDefault();
     this.showPassword = !this.showPassword;
     this.input.type = this.showPassword ? 'text' : 'password';
   }