diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 5a8884c5d..e4baaa23c 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.24</Version>
+		<Version>1.0.2.25</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/BTCPayServer/Services/Mails/EmailSettings.cs b/BTCPayServer/Services/Mails/EmailSettings.cs
index 93b062eec..c7952942f 100644
--- a/BTCPayServer/Services/Mails/EmailSettings.cs
+++ b/BTCPayServer/Services/Mails/EmailSettings.cs
@@ -55,7 +55,7 @@ namespace BTCPayServer.Services.Mails
         public SmtpClient CreateSmtpClient()
         {
             SmtpClient client = new SmtpClient(Server, Port.Value);
-            client.EnableSsl = true;
+            client.EnableSsl = EnableSSL;
             client.UseDefaultCredentials = false;
             client.Credentials = new NetworkCredential(Login, Password);
             client.DeliveryMethod = SmtpDeliveryMethod.Network;