diff --git a/html/includes/authentication/ldap.inc.php b/html/includes/authentication/ldap.inc.php
index 3073b1e65..1bd944b91 100644
--- a/html/includes/authentication/ldap.inc.php
+++ b/html/includes/authentication/ldap.inc.php
@@ -153,10 +153,11 @@ function get_userlist()
       $username = $entry['uid'][0];
       $realname = $entry['cn'][0];
       $user_id  = $entry['uidnumber'][0];
+      $email    = $entry[$config['auth_ldap_emailattr']][0];
 
       if (!isset($config['auth_ldap_group']) || ldap_compare($ds,$config['auth_ldap_group'],$config['auth_ldap_groupmemberattr'],get_membername($username))===true)
       {
-        $userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id);
+        $userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id, 'email' => $email);
       }
     }
   }
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 796c15a8d..ca8d59593 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -417,6 +417,7 @@ $config['auth_ldap_groups']['admin']['level'] = 10;
 $config['auth_ldap_groups']['pfy']['level'] = 7;
 $config['auth_ldap_groups']['support']['level'] = 1;
 $config['auth_ldap_groupmemberattr'] = "memberUid";
+$config['auth_ldap_emailattr'] = "mail";
 
 // Sensors