diff --git a/wise-webapp/src/main/java/com/wisemapping/model/User.java b/wise-webapp/src/main/java/com/wisemapping/model/User.java
index 1a5a557d..261471a8 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/User.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/User.java
@@ -31,8 +31,6 @@ import java.util.Set;
 @Entity
 @Table(name = "USER")
 @PrimaryKeyJoinColumn(name = "colaborator_id")
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class User
         extends Collaborator
         implements Serializable {
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
index f094f854..c6cbe13a 100644
--- a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
@@ -24,7 +24,7 @@ public interface Messages {
     String FIELD_REQUIRED = "FIELD_REQUIRED";
     String MAP_TITLE_ALREADY_EXISTS = "MAP_TITLE_ALREADY_EXISTS";
     String LABEL_TITLE_ALREADY_EXISTS = "LABEL_TITLE_ALREADY_EXISTS";
-    String PASSWORD_MISMATCH = "PASSWORD_MISMATCH";
+
     String CAPTCHA_LOADING_ERROR = "CAPTCHA_LOADING_ERROR";
 
     String CAPTCHA_TIMEOUT_OUT_DUPLICATE = "CAPTCHA_TIMEOUT_OUT_DUPLICATE";
diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties
index 5ab06621..8df1841d 100644
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@@ -4,7 +4,6 @@ SITE.TITLE=WiseMapping
 FIELD_REQUIRED=Ein benötigtes Feld kann icht leer gelassen werden
 EMAIL_ALREADY_EXIST=Die email Adresse existiert bereits.
 NO_VALID_EMAIL_ADDRESS=Ungültige email Adresse
-PASSWORD_MISMATCH=Ihre Passwort Angaben sind nicht identisch
 CREATOR=Urheber
 WELCOME=Willkommen
 SHARE=Veröffentlichen
diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index ef67f540..9faf64fc 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -5,7 +5,6 @@ FIELD_REQUIRED=Required field cannot be left blank
 EMAIL_ALREADY_EXIST=There is an account already with this email.
 NO_VALID_EMAIL_ADDRESS=Invalid email address
 INVALID_EMAIL_ADDRESS=Invalid email address. Please, verify that  your entered valid email address.
-PASSWORD_MISMATCH=Your password entries did not match
 CREATOR=Creator
 WELCOME=Welcome
 SHARE=Share
diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties
index 16512ea4..5709f524 100644
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@@ -4,7 +4,6 @@ SITE.TITLE = WiseMapping
 FIELD_REQUIRED = Campo requerido
 EMAIL_ALREADY_EXIST = E-mail ya existente.
 NO_VALID_EMAIL_ADDRESS = E-mail invalido
-PASSWORD_MISMATCH = La contraseña no concuerda
 CREATOR = Creador
 WELCOME = Bienvenido/a
 SHARE = Compartir
diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties
index 3411d942..417e99cb 100644
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@@ -4,7 +4,6 @@ SITE.TITLE=WiseMapping
 FIELD_REQUIRED=Ce champ ne peut pas rester vide
 EMAIL_ALREADY_EXIST=Cet email est déjà utilisé
 NO_VALID_EMAIL_ADDRESS=Email non valide
-PASSWORD_MISMATCH=Le mot de passe saisi ne correspond pas
 CREATOR=Créateur
 WELCOME=Bienvenue
 SHARE=Partager
diff --git a/wise-webapp/src/main/resources/messages_ru.properties b/wise-webapp/src/main/resources/messages_ru.properties
index 5bd75a47..53cbd9be 100644
--- a/wise-webapp/src/main/resources/messages_ru.properties
+++ b/wise-webapp/src/main/resources/messages_ru.properties
@@ -4,7 +4,6 @@ SITE.TITLE=WiseMapping
 FIELD_REQUIRED=Это поле обязательно для заполненияю
 EMAIL_ALREADY_EXIST=Аккаунт с таким e-mail уже существует.
 NO_VALID_EMAIL_ADDRESS=Некорректный адрес электронной почты.
-PASSWORD_MISMATCH=Пароли не совпадают
 CREATOR=Создатель
 WELCOME=Добро пожаловать
 SHARE=Поделиться
diff --git a/wise-webapp/src/main/resources/messages_zh.properties b/wise-webapp/src/main/resources/messages_zh.properties
index c3b44d80..0fa5ea2b 100644
--- a/wise-webapp/src/main/resources/messages_zh.properties
+++ b/wise-webapp/src/main/resources/messages_zh.properties
@@ -4,7 +4,6 @@ SITE.TITLE=WiseMapping
 FIELD_REQUIRED=必填字段不能为空
 EMAIL_ALREADY_EXIST=已经有一个账号使用此电子邮件。
 NO_VALID_EMAIL_ADDRESS=无效的电子邮件地址
-PASSWORD_MISMATCH=您输入的密码不一致
 CREATOR=创建人
 WELCOME=欢迎
 SHARE=分享