diff --git a/src/Core/GlobalSettings.cs b/src/Core/GlobalSettings.cs
index 194de26341..a4f8f173d3 100644
--- a/src/Core/GlobalSettings.cs
+++ b/src/Core/GlobalSettings.cs
@@ -87,8 +87,8 @@ namespace Bit.Core
             public class SmtpSettings
             {
                 public string Host { get; set; }
-                public int Port { get; set; }
-                public bool Ssl { get; set; }
+                public int Port { get; set; } = 587;
+                public bool Ssl { get; set; } = true;
                 public string Username { get; set; }
                 public string Password { get; set; }
             }
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index b2c912c158..79425596ec 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -392,7 +392,12 @@ globalSettings__duo__aKey={Helpers.SecureRandomString(64, alpha: true, numeric:
 globalSettings__installation__id={_installationId}
 globalSettings__installation__key={_installationKey}
 globalSettings__yubico__clientId=REPLACE
-globalSettings__yubico__key=REPLACE");
+globalSettings__yubico__key=REPLACE
+globalSettings__mail__smtp__host=REPLACE
+globalSettings__mail__smtp__username=REPLACE
+globalSettings__mail__smtp__password=REPLACE
+globalSettings__mail__smtp__ssl=true
+globalSettings__mail__smtp__port=587");
 
                 if(!_push)
                 {