diff --git a/include/class.email.php b/include/class.email.php
index 480b26eba3125b241301d08e42f630f5e36cc0d0..a55a0e3e478733e3c277ab8b19083fa857b2b154 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -120,7 +120,12 @@ class Email {
     }
 
     function isSMTPEnabled() {
-        return $this->ht['smtp_active'];
+
+        return (
+                $this->ht['smtp_active']
+                    && ($info=$this->getSMTPInfo())
+                    && (!$info['auth'] || $info['password'])
+                );
     }
 
     function allowSpoofing() {