diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java b/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java
index 3e45c9a29b950e75d0ff2287f0331a17e9f393ad..4c24d86ae39127f3b75bd5ccdc5ad24801839bf5 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java
@@ -537,7 +537,9 @@ public class UserService implements IUserService {
         if (user == null) {
           user = new User();
           user.setLogin(login);
-          user.setCryptedPassword(passwordEncoder.encode(password));
+          // this password will disable local logins (it should be a hash for valid
+          // logins)
+          user.setCryptedPassword("");
           user.setName(ldapUserData.getFirstName());
           user.setSurname(ldapUserData.getLastName());
           user.setEmail(ldapUserData.getEmail());
diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/UserServiceTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/UserServiceTest.java
index 73c5cb48462eb2fbf0ab4f0c187aadf5dfceb97c..da5dbb46a631e6ce2d0e12ca205092a233cec0c5 100644
--- a/service/src/test/java/lcsb/mapviewer/services/impl/UserServiceTest.java
+++ b/service/src/test/java/lcsb/mapviewer/services/impl/UserServiceTest.java
@@ -72,8 +72,13 @@ public class UserServiceTest extends ServiceTestFunctions {
       assertNotNull("User from LDAP wasn't authenticated", userService.login(login, passwd));
 
       User user = userService.getUserByLogin(login);
+      assertTrue("LDAP user password should be empty",
+          user.getCryptedPassword() == null || user.getCryptedPassword().isEmpty());
       assertNotNull("After authentication from LDAP user is not present in the system", user);
       assertTrue(user.isConnectedToLdap());
+
+      assertNotNull("User from LDAP couldn't be authenticate for the second time", userService.login(login, passwd));
+
     } catch (Exception e) {
       e.printStackTrace();
       throw e;