diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php
index 6aa16f45..0e459014 100644
--- a/inc/drivers_ldap.php
+++ b/inc/drivers_ldap.php
@@ -209,7 +209,12 @@ class ldapDrivers
       if ($username != $_SERVER["REMOTE_USER"]) {
         return false;
       }
-    } else {
+    }
+    else if ( empty($passwd) ) {
+      dbg_error_log( 'LDAP', 'drivers_ldap : user %s did not supply a password: login rejected', $dnUser );
+      return false;
+    }
+    else {
       if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) {
         dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s using password %s", $dnUser, $passwd );
         return false;