diff --git a/libnymea-core/usermanager/usermanager.cpp b/libnymea-core/usermanager/usermanager.cpp
index d593ef8e..732ec8ef 100644
--- a/libnymea-core/usermanager/usermanager.cpp
+++ b/libnymea-core/usermanager/usermanager.cpp
@@ -421,10 +421,10 @@ bool UserManager::validatePassword(const QString &password) const
     if (!password.contains(QRegExp("[a-z]"))) {
         return false;
     }
-    if (!password.contains(QRegExp("[0-9]"))) {
+    if (!password.contains(QRegExp("[A-Z]"))) {
         return false;
     }
-    if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\@€µ~]"))) {
+    if (!password.contains(QRegExp("[0-9]"))) {
         return false;
     }
     return true;
diff --git a/tests/auto/usermanager/testusermanager.cpp b/tests/auto/usermanager/testusermanager.cpp
index 629139e0..3df15460 100644
--- a/tests/auto/usermanager/testusermanager.cpp
+++ b/tests/auto/usermanager/testusermanager.cpp
@@ -67,10 +67,9 @@ void TestUsermanager::createUser_data() {
     QTest::newRow("foo@bar.baz, aaaaaaa!, BadPassword") << "foo@bar.baz" << "aaaaaaa!" << UserManager::UserErrorBadPassword;
     QTest::newRow("foo@bar.baz, aaaaaaaA, BadPassword") << "foo@bar.baz" << "aaaaaaaA" << UserManager::UserErrorBadPassword;
     QTest::newRow("foo@bar.baz, aaaaaa!A, BadPassword") << "foo@bar.baz" << "aaaaaa!A" << UserManager::UserErrorBadPassword;
+    QTest::newRow("foo@bar.baz, aaaaaa!1, BadPassword") << "foo@bar.baz" << "aaaaaa!1" << UserManager::UserErrorBadPassword;
 
-    QTest::newRow("foo@bar.baz, aaaaa!1A, BadPassword") << "foo@bar.baz" << "aaaaa!1A" << UserManager::UserErrorNoError;
-    QTest::newRow("foo@bar.baz, aaaaaa!1, BadPassword") << "foo@bar.baz" << "aaaaaa!1" << UserManager::UserErrorNoError;
-
+    QTest::newRow("foo@bar.baz, aaaaa!1A, NoError")            << "foo@bar.baz" << "aaaaa!1A" << UserManager::UserErrorNoError;
     QTest::newRow("foo@bar.baz, Bla1234*a, NoError")           << "foo@bar.baz" << "Bla1234*a" << UserManager::UserErrorNoError;
     QTest::newRow("foo@bar.baz, #1-Nymea-is-awesome, NoError") << "foo@bar.baz" << "#1-Nymea-is-awesome" << UserManager::UserErrorNoError;
     QTest::newRow("foo@bar.baz, Bla1234.a, NoError")           << "foo@bar.baz" << "Bla1234.a" << UserManager::UserErrorNoError;