diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/Tools/MailLogin.cs b/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/Tools/MailLogin.cs
index cabc27ce24..5162d778f5 100644
--- a/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/Tools/MailLogin.cs
+++ b/public/Nitrocid.Addons/Nitrocid.Extras.MailShell/Tools/MailLogin.cs
@@ -118,10 +118,10 @@ public enum ServerType
             }
             Authentication.Password = InputTools.ReadLineNoInput();
 
-            string DynamicAddressIMAP = ServerDetect(Username, ServerType.IMAP);
-            string DynamicAddressSMTP = ServerDetect(Username, ServerType.SMTP);
+            string DynamicAddressIMAP = AutoDetectServer ? ServerDetect(Username, ServerType.IMAP) : "";
+            string DynamicAddressSMTP = AutoDetectServer ? ServerDetect(Username, ServerType.SMTP) : "";
 
-            if (!string.IsNullOrEmpty(DynamicAddressIMAP) & !string.IsNullOrEmpty(DynamicAddressSMTP) & AutoDetectServer)
+            if (!string.IsNullOrEmpty(DynamicAddressIMAP) && !string.IsNullOrEmpty(DynamicAddressSMTP))
                 return ParseAddresses(DynamicAddressIMAP, 0, DynamicAddressSMTP, 0);
             else
                 return PromptServer();