1 files changed, 5 insertions, 2 deletions
diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js
index cc0d29ad..1a5c9938 100644
--- a/lib/web/auth/ldap/index.js
+++ b/lib/web/auth/ldap/index.js
@@ -24,8 +24,11 @@ passport.use(new LDAPStrategy({
   }
 }, function (user, done) {
   var uuid = user.uidNumber || user.uid || user.sAMAccountName
-  var username = uuid
+  if (config.ldap.useridField && user[config.ldap.useridField]) {
+    uuid = user[config.ldap.useridField]
+  }
 
+  var username = uuid
   if (config.ldap.usernameField && user[config.ldap.usernameField]) {
     username = user[config.ldap.usernameField]
   }
@@ -34,7 +37,7 @@ passport.use(new LDAPStrategy({
     id: 'LDAP-' + uuid,
     username: username,
     displayName: user.displayName,
-    emails: user.mail ? [user.mail] : [],
+    emails: user.mail ? Array.isArray(user.mail) ? user.mail : [user.mail] : [],
     avatarUrl: null,
     profileUrl: null,
     provider: 'ldap'