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 45a3aee29e..4190218f18 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
@@ -87,8 +87,6 @@
               </mat-option>
             </mat-select>
           </mat-form-field>
-
-
           <tb-checkbox formControlName="enableProxy" style="display: block; padding-bottom: 16px;">
             {{ 'admin.enable-proxy' | translate }}
           </tb-checkbox>
@@ -119,8 +117,6 @@
             <mat-label translate>admin.proxy-password</mat-label>
             <input matInput formControlName="proxyPassword">
           </mat-form-field>
-
-
           <mat-form-field class="mat-block">
             <mat-label translate>common.username</mat-label>
             <input matInput formControlName="username" placeholder="{{ 'common.enter-username' | translate }}"/>
diff --git a/ui-ngx/src/app/shared/models/settings.models.ts b/ui-ngx/src/app/shared/models/settings.models.ts
index 43d8ecf932..b863000f29 100644
--- a/ui-ngx/src/app/shared/models/settings.models.ts
+++ b/ui-ngx/src/app/shared/models/settings.models.ts
@@ -35,8 +35,8 @@ export interface MailServerSettings {
   enableProxy: boolean;
   proxyHost: string;
   proxyPort: number;
-  proxyUser?: string;
-  proxyPassword?: string;
+  proxyUser: string;
+  proxyPassword: string;
 }
 
 export interface GeneralSettings {