diff --git a/admin_settings.php b/admin_settings.php
index 66abf4aa..49e2bd8c 100644
--- a/admin_settings.php
+++ b/admin_settings.php
@@ -310,6 +310,8 @@ elseif ($page == 'testmail')
 				$testmail->Password = Settings::Get('system.mail_smtp_passwd');
 				if (Settings::Get('system.mail_smtp_usetls')) {
 					$testmail->SMTPSecure = 'tls';
+				} else {
+					$testmail->SMTPAutoTLS = false;
 				}
 				$testmail->Port = Settings::Get('system.mail_smtp_port');
 			}
diff --git a/lib/functions/output/function.dieWithMail.php b/lib/functions/output/function.dieWithMail.php
index 21890bdd..d0e5015b 100644
--- a/lib/functions/output/function.dieWithMail.php
+++ b/lib/functions/output/function.dieWithMail.php
@@ -42,6 +42,8 @@ function dieWithMail($message, $subject = "[froxlor] Cronjob error") {
 			$_mail->Password = Settings::Get('system.mail_smtp_passwd');
 			if (Settings::Get('system.mail_smtp_usetls')) {
 				$_mail->SMTPSecure = 'tls';
+			} else {
+				$mail->SMTPAutoTLS = false;
 			}
 			$_mail->Port = Settings::Get('system.mail_smtp_port');
 		}
diff --git a/lib/init.php b/lib/init.php
index d5747621..3436b237 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -564,6 +564,8 @@ if (Settings::Get('system.mail_use_smtp')) {
 	$mail->Password = Settings::Get('system.mail_smtp_passwd');
 	if (Settings::Get('system.mail_smtp_usetls')) {
 		$mail->SMTPSecure = 'tls';
+	} else {
+		$mail->SMTPAutoTLS = false;
 	}
 	$mail->Port = Settings::Get('system.mail_smtp_port');
 }
diff --git a/scripts/jobs/cron_usage_report.php b/scripts/jobs/cron_usage_report.php
index 2ff94b52..9bc9eea4 100644
--- a/scripts/jobs/cron_usage_report.php
+++ b/scripts/jobs/cron_usage_report.php
@@ -34,6 +34,8 @@ if (Settings::Get('system.mail_use_smtp')) {
 	$mail->Password = Settings::Get('system.mail_smtp_passwd');
 	if (Settings::Get('system.mail_smtp_usetls')) {
 		$mail->SMTPSecure = 'tls';
+	} else {
+		$mail->SMTPAutoTLS = false;
 	}
 	$mail->Port = Settings::Get('system.mail_smtp_port');
 }