diff --git a/Remotely_Server/CurrentVersion.txt b/Remotely_Server/CurrentVersion.txt
index 524f4006..3583a26c 100644
--- a/Remotely_Server/CurrentVersion.txt
+++ b/Remotely_Server/CurrentVersion.txt
@@ -1 +1 @@
-2019.04.08.0720
+2019.04.10.0649
diff --git a/Remotely_Server/Program.cs b/Remotely_Server/Program.cs
index 790cc0a7..ba0641ab 100644
--- a/Remotely_Server/Program.cs
+++ b/Remotely_Server/Program.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Remotely_Shared.Services;
 
 namespace Remotely_Server
 {
@@ -26,6 +27,10 @@ namespace Remotely_Server
                     logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     logging.AddConsole();
                     logging.AddDebug();
+                    if (OSUtils.IsWindows)
+                    {
+                        logging.AddEventLog();
+                    }
                 });
     }
 }
diff --git a/Remotely_Server/Remotely_Server.csproj b/Remotely_Server/Remotely_Server.csproj
index 06dd3347..04257731 100644
--- a/Remotely_Server/Remotely_Server.csproj
+++ b/Remotely_Server/Remotely_Server.csproj
@@ -59,6 +59,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" PrivateAssets="All" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
diff --git a/Remotely_Server/Services/ApplicationConfig.cs b/Remotely_Server/Services/ApplicationConfig.cs
index 88ad18cc..96232caa 100644
--- a/Remotely_Server/Services/ApplicationConfig.cs
+++ b/Remotely_Server/Services/ApplicationConfig.cs
@@ -30,6 +30,7 @@ namespace Remotely_Server.Services
         public string SmtpPassword => Config["ApplicationOptions:SmtpPassword"];
         public string SmtpEmail => Config["ApplicationOptions:SmtpEmail"];
         public string SmtpDisplayName => Config["ApplicationOptions:SmtpDisplayName"];
+        public bool SmtpEnableSsl => bool.Parse(Config["ApplicationOptions:SmtpEnableSsl"]);
 
 
         private IConfiguration Config { get; set; }
diff --git a/Remotely_Server/Services/EmailSender.cs b/Remotely_Server/Services/EmailSender.cs
index 6576cb72..5986d58a 100644
--- a/Remotely_Server/Services/EmailSender.cs
+++ b/Remotely_Server/Services/EmailSender.cs
@@ -31,7 +31,7 @@ namespace Remotely_Server.Services
                 var mailClient = new SmtpClient();
                 mailClient.Host = AppConfig.SmtpHost;
                 mailClient.Port = AppConfig.SmtpPort;
-                mailClient.EnableSsl = true;
+                mailClient.EnableSsl = AppConfig.SmtpEnableSsl;
                 mailClient.Credentials = new NetworkCredential(AppConfig.SmtpUserName, AppConfig.SmtpPassword);
                 mailClient.DeliveryMethod = SmtpDeliveryMethod.Network;
 
diff --git a/Remotely_Server/appsettings.json b/Remotely_Server/appsettings.json
index a2f5e82f..e10b687b 100644
--- a/Remotely_Server/appsettings.json
+++ b/Remotely_Server/appsettings.json
@@ -25,6 +25,7 @@
     "SmtpUserName": "",
     "SmtpPassword": "",
     "SmtpEmail": "",
-    "SmtpDisplayName": ""
+    "SmtpDisplayName": "",
+    "SmtpEnableSsl":  true
   }
 }
\ No newline at end of file