diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
index 0f0bd198d..7b0c4e0f1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
@@ -21,7 +21,37 @@
 
         <div class="red-content-inner">
             <div class="content-container">
-                <div class="dialog">
+                <div class="dialog mb-8">
+                    <div class="dialog-header">
+                        <div class="heading-l" translate="smtp-config-screen.general.title"></div>
+                        <div translate="smtp-config-screen.general.subtitle"></div>
+                    </div>
+                    <div class="dialog-content">
+                        <div class="inline-input-group flex-align-items-center">
+                            <mat-slide-toggle
+                                [(ngModel)]="showForgotPassword"
+                                color="primary"
+                            ></mat-slide-toggle>
+                            <span
+                                translate="smtp-config-screen.general.form.forgot-password"
+                                class="ml-8"
+                            ></span>
+                        </div>
+                    </div>
+                    <div class="dialog-actions">
+                        <button
+                            [disabled]="!generalConfigChanged"
+                            (click)="saveGeneralConfig()"
+                            color="primary"
+                            mat-flat-button
+                            type="submit"
+                        >
+                            {{ 'smtp-config-screen.actions.save' | translate }}
+                        </button>
+                    </div>
+                </div>
+
+                <div class="dialog mt-16">
                     <div class="dialog-header">
                         <div class="heading-l" translate="smtp-config-screen.title"></div>
                         <div translate="smtp-config-screen.subtitle"></div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.scss
index 84d3d1473..9f8fb3eed 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.scss
@@ -4,7 +4,25 @@
 .content-container {
     background-color: $grey-2;
     display: flex;
-    justify-content: center;
+    flex-direction: column;
+    align-items: center;
     @include scroll-bar;
     overflow: auto;
 }
+
+.w-100 {
+    min-width: 100px;
+    width: 100px;
+}
+
+.inline-input-group {
+    background-color: rgba($grey-6, 0.8);
+    width: 100%;
+    height: 38px;
+    border-radius: 4px;
+    padding: 1px 11px;
+}
+
+.dialog {
+    width: 100%;
+}
diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
index 774714b83..bba8c6480 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.ts
@@ -14,6 +14,7 @@ import { TranslateService } from '@ngx-translate/core';
 export class SmtpConfigScreenComponent implements OnInit {
     viewReady = false;
     configForm: FormGroup;
+    showForgotPassword = false;
 
     private _initialValue: SMTPConfigurationModel;
 
@@ -59,6 +60,10 @@ export class SmtpConfigScreenComponent implements OnInit {
         return false;
     }
 
+    get generalConfigChanged(): boolean {
+        return true;
+    }
+
     async ngOnInit() {
         await this._loadData();
     }
@@ -72,6 +77,12 @@ export class SmtpConfigScreenComponent implements OnInit {
         this.viewReady = true;
     }
 
+    async saveGeneralConfig() {
+        this.viewReady = false;
+        console.log('Saving general configuration...');
+        this.viewReady = true;
+    }
+
     openAuthConfigDialog(skipDisableOnCancel?: boolean) {
         this._dialogService.openSMTPAuthConfigDialog(this.configForm.getRawValue(), authConfig => {
             if (authConfig) {
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
index 3b84f926d..2ba7f35a8 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
@@ -68,10 +68,6 @@
     margin-right: 8px;
 }
 
-.ml-8 {
-    margin-left: 8px;
-}
-
 .ml-2 {
     margin-left: 2px;
 }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index ff8d62a9d..faf709953 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1088,6 +1088,13 @@
   },
   "configurations": "Configurations",
   "smtp-config-screen": {
+    "general": {
+      "title": "General Configurations",
+      "subtitle": "",
+      "form": {
+        "forgot-password": "Show Forgot password link on Login screen"
+      }
+    },
     "title": "Configure SMTP Account",
     "subtitle": "SMTP (Simple Mail Transfer Protocol) enables you to send your emails through the specified server settings.",
     "actions": {
diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss
index a1237d801..afb6047f7 100644
--- a/apps/red-ui/src/assets/styles/red-page-layout.scss
+++ b/apps/red-ui/src/assets/styles/red-page-layout.scss
@@ -234,7 +234,7 @@ section.settings {
 }
 
 .mt-16 {
-    margin-top: 16px;
+    margin-top: 16px !important;
 }
 
 .mt-20 {
@@ -253,6 +253,10 @@ section.settings {
     margin-bottom: 8px !important;
 }
 
+.ml-8 {
+    margin-left: 8px;
+}
+
 .ml-14 {
     margin-left: 14px;
 }