diff --git a/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs b/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
index 56ca0ab9..dbc300e7 100644
--- a/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
+++ b/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
@@ -48,13 +48,16 @@ namespace Wino.Core.Domain.Models.AutoDiscovery
                 OutgoingServerPassword = UserMinimalSettings.Password,
                 IncomingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
                 OutgoingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
+                OutgoingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
+                IncomingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
                 IncomingServer = imapUrl,
                 OutgoingServer = smtpUrl,
                 IncomingServerPort = imapPort.ToString(),
                 OutgoingServerPort = smtpPort.ToString(),
                 IncomingServerType = Enums.CustomIncomingServerType.IMAP4,
                 IncomingServerUsername = imapUsername,
-                OutgoingServerUsername = smtpUsername
+                OutgoingServerUsername = smtpUsername,
+                MaxConcurrentClients = 5
             };
 
             return serverInfo;
diff --git a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
index 12ac4032..5dff0f3e 100644
--- a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
@@ -149,7 +149,8 @@ namespace Wino.Views.ImapSetup
                 ProxyServer = ProxyServerBox.Text,
                 ProxyServerPort = ProxyServerPortBox.Text,
                 Address = AddressBox.Text,
-                DisplayName = DisplayNameBox.Text
+                DisplayName = DisplayNameBox.Text,
+                MaxConcurrentClients = 5
             };
 
             if (UseSameCredentialsForSending)