diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java
index 25df6088cff3..d8177cb4cf85 100644
--- a/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java
@@ -202,7 +202,7 @@ public Map<String, Object> addUser(String userId, String firstName, String lastN
 			if (localTransaction) {
 				HibernateUtil.rollbackTransaction();
 			}
-			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request),"User-Info-Save-Failed : " + e.getMessage()),"User-Info-Save-Failed",e);
+			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request), e.getMessage()),"User-Info-Save-Failed",e);
 
 		}
 
diff --git a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
index 782f5f57793a..7827802f137c 100644
--- a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
+++ b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
@@ -4739,7 +4739,7 @@ user-id=User ID
 User-Info-Save-Failed=User Information Save Failed
 User-Info-Save-First-Name-Failed=First Name not valid
 User-Info-Save-Last-Name-Failed=Last Name not valid
-User-Info-Save-Password-Failed=The password does not meet the system security requirements. It must contain at least 8 characters and no white spaces.
+User-Info-Save-Password-Failed=Your password must be at least 8 characters long and include at least and one special character from the list  # % + : = ? @ It must not contain spaces.
 User-Info-Save-Password-Recycle-Failed=The password has been already used lately and cannot be reused yet.
 user-info-saved=User info saved
 User-Info-Saved=User Information Saved