diff --git a/conf/core/server.conf b/conf/core/server.conf
index 5cad243fd60827437ae35fc3a9ba06c05feb6a88..57744250a7ef88285b343aa5c037de9cbbf97097 100644
--- a/conf/core/server.conf
+++ b/conf/core/server.conf
@@ -209,7 +209,7 @@ USER_NAME_VALID_REGEX=^[\\w\\.][\\w\\.-]*{1,32}$
 USER_NAME_INVALID_MESSAGE=User names must have a length from 1 to 32 characters. They must contain only latin letters a-z (upper case or lower case), number 0-9, dots (.), underscores (_), or hyphens (-). They must no start with a hyphen.
 
 PASSWORD_VALID_REGEX=^((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[\\p{Punct}]).{8,128})$
-PASSWORD_INVALID_MESSAGE=blablabla
+PASSWORD_INVALID_MESSAGE=Passwords must have a length from 8 to 128 characters. THe must contain at least one [A-Z], one [a-z], one [0-9] and a special character e.g. [!§$%&/()=?.;,:#+*+~].
 
 # --------------------------------------------------
 # Extensions
diff --git a/src/main/java/org/caosdb/server/utils/ServerMessages.java b/src/main/java/org/caosdb/server/utils/ServerMessages.java
index 0ec31162490900f93b497ebb33f0defb617d1114..835087ce8825de6c136dabd746534bc42f3240d5 100644
--- a/src/main/java/org/caosdb/server/utils/ServerMessages.java
+++ b/src/main/java/org/caosdb/server/utils/ServerMessages.java
@@ -403,7 +403,7 @@ public class ServerMessages {
     return new Message(
         MessageType.Error,
         MessageCode.MESSAGE_CODE_UNKNOWN,
-        "This password does not match the current policies for passwords: " + policy);
+        "The password does not comply with the current policies for passwords: " + policy);
   }
 
   public static final Message AFFILIATION_ERROR =
@@ -610,7 +610,7 @@ public class ServerMessages {
     return new Message(
         MessageType.Error,
         MessageCode.MESSAGE_CODE_UNKNOWN,
-        "The user name does not comply with the policies for user names: " + policy);
+        "The user name does not comply with the current policies for user names: " + policy);
   }
 
   public static final Message CANNOT_DELETE_YOURSELF() {