diff --git a/server/loginHandler.js b/server/loginHandler.js
index a8f013d..81d22f8 100644
--- a/server/loginHandler.js
+++ b/server/loginHandler.js
@@ -134,7 +134,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 
   if (!user && email && LDAP.settings_get('LDAP_EMAIL_MATCH_ENABLE') === true) {
 
-    log_info('No user exists with username', username, '- attempting to find by e-mail address instead');
+    log_info(`No user exists with username ${username} - attempting to find by e-mail address instead`);
 
     if(LDAP.settings_get('LDAP_EMAIL_MATCH_VERIFIED') === true) {
       userQuery = {
diff --git a/server/sync.js b/server/sync.js
index 141ef34..810339e 100644
--- a/server/sync.js
+++ b/server/sync.js
@@ -74,13 +74,16 @@ export function getLdapUsername(ldapUser) {
 export function getLdapEmail(ldapUser) {
   const emailField = LDAP.settings_get('LDAP_EMAIL_FIELD');
 
+  let email;
   if (emailField.indexOf('#{') > -1) {
-    return emailField.replace(/#{(.+?)}/g, function(match, field) {
+    email = emailField.replace(/#{(.+?)}/g, function (match, field) {
       return ldapUser.getLDAPValue(field);
     });
+  } else {
+    email = ldapUser.getLDAPValue(emailField);
   }
 
-  return ldapUser.getLDAPValue(emailField);
+  return email.toLowerCase();
 }
 
 export function getLdapFullname(ldapUser) {