diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs b/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs
index 5436937f4..7a7c0b37a 100644
--- a/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs
+++ b/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs
@@ -79,8 +79,6 @@ public class UIStoresEmailController(
             {
                 ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]);
             }
-            if (!ModelState.IsValid)
-                return View(model);
         }
 
         var storeBlob = store.GetStoreBlob();
@@ -88,6 +86,9 @@ public class UIStoresEmailController(
         if (model is { IsCustomSMTP: true, Settings: { Password: null } })
             model.Settings.Password = currentSettings?.Password;
 
+        if (!ModelState.IsValid && command is not ("ResetPassword" or "mailpit"))
+            return View(model);
+
         if (command == "Test")
         {
             try
diff --git a/BTCPayServer/Services/Mails/EmailSettings.cs b/BTCPayServer/Services/Mails/EmailSettings.cs
index 47246f349..17671faf3 100644
--- a/BTCPayServer/Services/Mails/EmailSettings.cs
+++ b/BTCPayServer/Services/Mails/EmailSettings.cs
@@ -27,7 +27,7 @@ namespace BTCPayServer.Services.Mails
             get => !DisableCertificateCheck;
             set { DisableCertificateCheck = !value; }
         }
-        
+
         // Conversion functions for mapping to and from the client EmailSettingsData model
 #nullable enable
         public static EmailSettings FromData(EmailSettingsData data, string? existingPassword)
@@ -37,12 +37,12 @@ namespace BTCPayServer.Services.Mails
                 Port = data.Port,
                 Login = data.Login,
                 // If login was provided but password was not, use the existing password from database
-                Password = !string.IsNullOrEmpty(data.Login) && string.IsNullOrEmpty(data.Password) ? 
+                Password = !string.IsNullOrEmpty(data.Login) && string.IsNullOrEmpty(data.Password) ?
                     existingPassword : data.Password,
                 From = data.From,
                 DisableCertificateCheck = data.DisableCertificateCheck
             };
-        
+
         public T ToData<T>() where T : EmailSettingsData, new()
             => new T()
             {
@@ -54,34 +54,24 @@ namespace BTCPayServer.Services.Mails
                 DisableCertificateCheck = DisableCertificateCheck
             };
 #nullable restore
-        
-        
-        // 
+
+
+        //
         public bool IsComplete()
         {
             return MailboxAddressValidator.IsMailboxAddress(From)
                 && !string.IsNullOrWhiteSpace(Server)
-                && Port != null;
+                && Port != null
+                && !string.IsNullOrWhiteSpace(From)
+                && MailboxAddressValidator.IsMailboxAddress(From);
         }
 
         public void Validate(string prefixKey, ModelStateDictionary modelState)
         {
-            if (string.IsNullOrWhiteSpace(From))
-            {
-                modelState.AddModelError($"{prefixKey}{nameof(From)}", new RequiredAttribute().FormatErrorMessage(nameof(From)));
-            }
-            if (!MailboxAddressValidator.IsMailboxAddress(From))
+            if (!string.IsNullOrEmpty(From) && !MailboxAddressValidator.IsMailboxAddress(From))
             {
                 modelState.AddModelError($"{prefixKey}{nameof(From)}", MailboxAddressAttribute.ErrorMessageConst);
             }
-            if (string.IsNullOrWhiteSpace(Server))
-            {
-                modelState.AddModelError($"{prefixKey}{nameof(Server)}", new RequiredAttribute().FormatErrorMessage(nameof(Server)));
-            }
-            if (Port is null)
-            {
-                modelState.AddModelError($"{prefixKey}{nameof(Port)}", new RequiredAttribute().FormatErrorMessage(nameof(Port)));
-            }
         }
 
         public MimeMessage CreateMailMessage(MailboxAddress to, string subject, string message, bool isHtml) =>