diff --git a/login_server/src/LOCALE/de_DE.mo b/login_server/src/LOCALE/de_DE.mo
index bfee8efd3..6a1735b6a 100644
Binary files a/login_server/src/LOCALE/de_DE.mo and b/login_server/src/LOCALE/de_DE.mo differ
diff --git a/login_server/src/LOCALE/de_DE.po b/login_server/src/LOCALE/de_DE.po
index b4bca3098..2b97bd88c 100644
--- a/login_server/src/LOCALE/de_DE.po
+++ b/login_server/src/LOCALE/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-21 13:37+0200\n"
-"PO-Revision-Date: 2021-06-21 13:38+0200\n"
+"POT-Creation-Date: 2021-09-23 17:56+0200\n"
+"PO-Revision-Date: 2021-09-23 17:59+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -455,11 +455,10 @@ msgstr "Gradido: Passwort zurücksetzen"
 #: src/cpp/SingletonManager/SessionManager.cpp:604
 msgid ""
 "Please enter a valid password with at least 8 characters, upper and lower "
-"case letters, at least one number and one special character (@$!%*?&+-_)!"
+"case letters, at least one number and one special character!"
 msgstr ""
 "Bitte gebe ein gültiges Password ein mit mindestens 8 Zeichen, Groß- und "
-"Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen (@$!%*?&+-_) "
-"ein!"
+"Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen ein!"
 
 #: src/cpp/SingletonManager/SessionManager.cpp:610
 msgid "Your password is to short!"
@@ -478,8 +477,8 @@ msgid "Your password does not contain any number!"
 msgstr "Dein Passwort enthält keine Zahlen!"
 
 #: src/cpp/SingletonManager/SessionManager.cpp:630
-msgid "Your password does not contain special characters (@$!%*?&+-)!"
-msgstr "Dein Passwort enthält keine Sonderzeichen (@$!%*?&+-)!"
+msgid "Your password does not contain special characters!"
+msgstr "Dein Passwort enthält keine Sonderzeichen!"
 
 #~ msgid "Account"
 #~ msgstr "Konto"
diff --git a/login_server/src/cpp/SingletonManager/SessionManager.cpp b/login_server/src/cpp/SingletonManager/SessionManager.cpp
index d854c2a97..13f2a7dd4 100644
--- a/login_server/src/cpp/SingletonManager/SessionManager.cpp
+++ b/login_server/src/cpp/SingletonManager/SessionManager.cpp
@@ -46,7 +46,7 @@ bool SessionManager::init()
 		case VALIDATE_NAME: mValidations[i] = new Poco::RegularExpression("^[^<>&;]{2,}$"); break;
 		case VALIDATE_USERNAME: mValidations[i] = new Poco::RegularExpression("^[a-zA-Z][a-zA-Z0-9_-]*$"); break;
 		case VALIDATE_EMAIL: mValidations[i] = new Poco::RegularExpression("^[a-zA-Z0-9.!#$%&?*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$"); break;
-		case VALIDATE_PASSWORD: mValidations[i] = new Poco::RegularExpression("^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@$!%*?&+-_])[A-Za-z0-9@$!%*?&+-_]{8,}$"); break;
+		case VALIDATE_PASSWORD: mValidations[i] = new Poco::RegularExpression("^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9]).{8,}$"); break;
 		case VALIDATE_PASSPHRASE: mValidations[i] = new Poco::RegularExpression("^(?:[a-z]* ){23}[a-z]*\s*$"); break;
 		case VALIDATE_GROUP_ALIAS: mValidations[i] = new Poco::RegularExpression("^[a-z0-9-]{3,120}"); break;
 		case VALIDATE_HEDERA_ID: mValidations[i] = new Poco::RegularExpression("^[0-9]*\.[0-9]*\.[0-9]\.$"); break;
@@ -56,7 +56,7 @@ bool SessionManager::init()
 		case VALIDATE_ONLY_HEX: mValidations[i] = new Poco::RegularExpression("^(0x)?[a-fA-F0-9]*$"); break;
 		//case VALIDATE_ONLY_URL: mValidations[i] = new Poco::RegularExpression("^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}$"); break;
 		case VALIDATE_ONLY_URL: mValidations[i] = new Poco::RegularExpression("^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\/?"); break;
-		case VALIDATE_HAS_SPECIAL_CHARACTER: mValidations[i] = new Poco::RegularExpression(".*[@$!%*?&+-].*"); break;
+		case VALIDATE_HAS_SPECIAL_CHARACTER: mValidations[i] = new Poco::RegularExpression(".*[^a-zA-Z0-9].*"); break;
 		case VALIDATE_HAS_UPPERCASE_LETTER:
 			mValidations[i] = new Poco::RegularExpression(".*[A-Z].*");
 			ServerConfig::g_ServerKeySeed->put(i, DRRandom::r64());
@@ -601,7 +601,7 @@ bool SessionManager::checkPwdValidation(const std::string& pwd, NotificationList
 	if (!isValid(pwd, VALIDATE_PASSWORD)) {
 		errorReciver->addError(new Error(
 			lang->gettext("Password"),
-			lang->gettext("Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character (@$!%*?&+-_)!")));
+			lang->gettext("Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!")));
 
 		// @$!%*?&+-
 		if (pwd.size() < 8) {
@@ -627,7 +627,7 @@ bool SessionManager::checkPwdValidation(const std::string& pwd, NotificationList
 		else if (!isValid(pwd, VALIDATE_HAS_SPECIAL_CHARACTER)) {
 			errorReciver->addError(new Error(
 				lang->gettext("Password"),
-				lang->gettext("Your password does not contain special characters (@$!%*?&+-)!")));
+				lang->gettext("Your password does not contain special characters!")));
 		}
 
 		return false;
diff --git a/login_server/src/cpsp/UserUpdatePassword.cpsp b/login_server/src/cpsp/UserUpdatePassword.cpsp
index 04d1e487e..260a29475 100644
--- a/login_server/src/cpsp/UserUpdatePassword.cpsp
+++ b/login_server/src/cpsp/UserUpdatePassword.cpsp
@@ -85,7 +85,7 @@ enum PageState {
 		<form method="POST">
 			<p>
 				Bitte denke dir ein sicheres Passwort aus, das mindestens 8 Zeichen lang ist, einen Klein- und einen Gro&szlig;buchstaben enth&auml;lt,
-				eine Zahl und eines der folgenden Sonderzeichen: @$!%*?&+-
+				eine Zahl und ein Sonderzeichen.
 			</p>
 			<label class="form-label" for="register-password">Passwort</label>
 			<input class="form-control" id="register-password" type="password" name="register-password"/>