diff --git a/libnymea-core/usermanager.cpp b/libnymea-core/usermanager.cpp
index 1ef832e2..c7af9339 100644
--- a/libnymea-core/usermanager.cpp
+++ b/libnymea-core/usermanager.cpp
@@ -421,7 +421,7 @@ bool UserManager::validatePassword(const QString &password) const
     if (!password.contains(QRegExp("[0-9]"))) {
         return false;
     }
-    if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\]"))) {
+    if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\@]"))) {
         return false;
     }
     return true;
diff --git a/tests/auto/usermanager/testusermanager.cpp b/tests/auto/usermanager/testusermanager.cpp
index b4234d5e..d9f9b150 100644
--- a/tests/auto/usermanager/testusermanager.cpp
+++ b/tests/auto/usermanager/testusermanager.cpp
@@ -74,6 +74,7 @@ void TestUsermanager::createUser_data() {
     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;
     QTest::newRow("foo@bar.baz, Bla1234\\a, NoError")          << "foo@bar.baz" << "Bla1234\\a" << UserManager::UserErrorNoError;
+    QTest::newRow("foo@bar.baz, Bla1234@a, NoError")           << "foo@bar.baz" << "Bla1234@a" << UserManager::UserErrorNoError;
 
 }