diff --git a/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html b/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
index 9ed77a4eda..88424b72eb 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
@@ -118,16 +118,18 @@
             </mat-form-field>
             <mat-form-field class="mat-block">
               <mat-label translate>admin.proxy-password</mat-label>
-              <input matInput formControlName="proxyPassword">
+              <input matInput type="password" formControlName="proxyPassword" autocomplete="new-proxy-password">
             </mat-form-field>
           </div>
           <mat-form-field class="mat-block">
             <mat-label translate>common.username</mat-label>
-            <input matInput formControlName="username" placeholder="{{ 'common.enter-username' | translate }}"/>
+            <input matInput formControlName="username" placeholder="{{ 'common.enter-username' | translate }}"
+                   autocomplete="new-username"/>
           </mat-form-field>
           <mat-form-field class="mat-block">
             <mat-label translate>common.password</mat-label>
-            <input matInput formControlName="password" type="password" placeholder="{{ 'common.enter-password' | translate }}"/>
+            <input matInput formControlName="password" type="password"
+                   placeholder="{{ 'common.enter-password' | translate }}" autocomplete="new-password"/>
           </mat-form-field>
           <div fxLayout="row" fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end" fxLayoutGap="16px">
             <button mat-raised-button type="button"
diff --git a/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts b/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts
index 0cdf0e7a7c..4fa8e16612 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts
@@ -92,7 +92,7 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
   }
 
   enableProxyChanged(): void {
-    let enableProxy: boolean = this.mailSettings.get('enableProxy').value;
+    const enableProxy: boolean = this.mailSettings.get('enableProxy').value;
     if (enableProxy) {
       this.mailSettings.get('proxyHost').enable();
       this.mailSettings.get('proxyPort').enable();