diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpSettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpSettingsConfiguration.cs
index 798ac566247..4d2c9b3ce8d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpSettingsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Services/SmtpSettingsConfiguration.cs
@@ -1,8 +1,6 @@
-using System;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using OrchardCore.Entities;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Email.Services
@@ -34,11 +32,15 @@ public void Configure(SmtpSettings options)
             options.PickupDirectoryLocation = settings.PickupDirectoryLocation;
             options.Host = settings.Host;
             options.Port = settings.Port;
+            options.ProxyHost = settings.ProxyHost;
+            options.ProxyPort = settings.ProxyPort;
             options.EncryptionMethod = settings.EncryptionMethod;
             options.AutoSelectEncryption = settings.AutoSelectEncryption;
             options.RequireCredentials = settings.RequireCredentials;
             options.UseDefaultCredentials = settings.UseDefaultCredentials;
             options.UserName = settings.UserName;
+            options.Password = settings.Password;
+            options.IgnoreInvalidSslCertificate = settings.IgnoreInvalidSslCertificate;
 
             // Decrypt the password
             if (!string.IsNullOrWhiteSpace(settings.Password))