diff --git a/server/ldap.js b/server/ldap.js
index fd007c2..6b2d4df 100644
--- a/server/ldap.js
+++ b/server/ldap.js
@@ -3,47 +3,6 @@ import util from 'util';
 import Bunyan from 'bunyan';
 import { log_debug, log_info, log_warn, log_error } from './logger';
 
-
-// Use them to test the ldap withn't use snap
-// process.env.LDAP_ENABLE = 'true';
-// process.env.LDAP_PORT = '389';
-// process.env.LDAP_HOST = '';
-// process.env.LDAP_BASEDN = '';
-// process.env.LDAP_LOGIN_FALLBACK = 'false';
-// process.env.LDAP_RECONNECT = 'true';
-// process.env.LDAP_TIMEOUT = '10000';
-// process.env.LDAP_IDLE_TIMEOUT = '10000';
-// process.env.LDAP_CONNECT_TIMEOUT = '10000';
-// process.env.LDAP_AUTHENTIFICATION = 'true';
-// process.env.LDAP_AUTHENTIFICATION_USERDN = '';
-// process.env.LDAP_AUTHENTIFICATION_PASSWORD = '';
-// process.env.LDAP_BACKGROUND_SYNC = 'false';
-// process.env.LDAP_BACKGROUND_SYNC_INTERVAL = '100';
-// process.env.LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED = 'false';
-// process.env.LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS = 'false';
-// process.env.LDAP_ENCRYPTION = 'false';
-// process.env.LDAP_CA_CERT = '';
-// process.env.LDAP_REJECT_UNAUTHORIZED = 'false';
-// process.env.LDAP_USER_SEARCH_FILTER = '';
-// process.env.LDAP_USER_SEARCH_SCOPE = '';
-// process.env.LDAP_USER_SEARCH_FIELD = '';
-// process.env.LDAP_SEARCH_PAGE_SIZE = '0';
-// process.env.LDAP_SEARCH_SIZE_LIMIT = '0';
-// process.env.LDAP_GROUP_FILTER_ENABLE = 'false';
-// process.env.LDAP_GROUP_FILTER_OBJECTCLASS = '';
-// process.env.LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE = '';
-// process.env.LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE = '';
-// process.env.LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT = '';
-// process.env.LDAP_GROUP_FILTER_GROUP_NAME = '';
-// process.env.LDAP_UNIQUE_IDENTIFIER_FIELD = '';
-// process.env.LDAP_UTF8_NAMES_SLUGIFY = 'true';
-// process.env.LDAP_USERNAME_FIELD = '';
-// process.env.LDAP_MERGE_EXISTING_USERS = 'false';
-// process.env.LDAP_SYNC_USER_DATA = 'false';
-// process.env.LDAP_SYNC_USER_DATA_FIELDMAP = '';
-// process.env.LDAP_SYNC_GROUP_ROLES = '';
-// process.env.LDAP_DEFAULT_DOMAIN = '';
-
 export default class LDAP {
   constructor(){
     this.ldapjs = ldapjs;
diff --git a/server/logger.js b/server/logger.js
index 0c5c93f..afd7711 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -1,4 +1,5 @@
-const isLogEnabled = (process.env.LDAP_INTERNAL_LOG_LEVEL === 'true');
+const isLogEnabled = (process.env.LDAP_LOG_ENABLED === 'true');
+
 
 function log (level, message, data) { 
     if (isLogEnabled) {
diff --git a/server/loginHandler.js b/server/loginHandler.js
index 391e462..2008b78 100644
--- a/server/loginHandler.js
+++ b/server/loginHandler.js
@@ -107,8 +107,8 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 
   // Login user if they exist
   if (user) {
-    if (user.ldap !== true && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') !== true) {
-      log_info('User exists without "ldap: true"');
+    if (user.authenticationMethod !== 'ldap' && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') !== true) {
+      log_info('User exists without "authenticationMethod : ldap"');
       throw new Meteor.Error('LDAP-login-error', `LDAP Authentication succeded, but there's already an existing user with provided username [${ username }] in Mongo.`);
     }
 
@@ -171,7 +171,5 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
     throw result;
   }
 
-  console.log('RESULT : ', result);
-
   return result;
 });
diff --git a/server/sync.js b/server/sync.js
index 05446b5..5193f96 100644
--- a/server/sync.js
+++ b/server/sync.js
@@ -192,7 +192,7 @@ export function getDataToSyncUserData(ldapUser, user) {
     userData['services.ldap.idAttribute'] = uniqueId.attribute;
   }
 
-  if (user.ldap !== true) {
+  if (user.authenticationMethod !== 'ldap') {
     userData.ldap = true;
   }
 
@@ -260,7 +260,7 @@ export function addLdapUser(ldapUser, username, password) {
 		    $set: {
 		        'services.ldap': { id: uniqueId.value },
 		        'emails.0.verified': true,
-		        ldap: true,
+		        'authenticationMethod': 'ldap',
 		    }});
   } catch (error) {
     log_error('Error creating user', error);