diff --git a/User.cpp b/User.cpp
index 8a078f13..a7c34ddf 100644
--- a/User.cpp
+++ b/User.cpp
@@ -405,7 +405,7 @@ bool CUser::IsValidUserName(const CString& sUserName) {
 	}
 
 	while (*p) {
-		if (*p != '-' && *p != '_' && !isalnum(*p)) {
+		if (*p != '@' && *p != '.' && *p != '-' && *p != '_' && !isalnum(*p)) {
 			return false;
 		}