diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc
index 4de1b5e4..c1d8abba 100644
--- a/lam/lib/modules/account.inc
+++ b/lam/lib/modules/account.inc
@@ -92,7 +92,7 @@ class account extends baseModule {
 			'user' => array(
 				'uid' => array(
 					"Headline" => _("User name"), 'attr' => 'uid',
-					"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_.")
+					"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, @.-_.")
 				),
 				'description'	=>	array (
 					"Headline" => _("Description"), 'attr' => 'description',
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 4a69e02f..f62031bc 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -703,7 +703,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 			),
 			'uid' => array(
 				"Headline" => _("User name"), 'attr' => 'uid',
-				"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_.")
+				"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, @.-_.")
 			),
 			'photoUpload' => array(
 				"Headline" => _("Add photo"), 'attr' => 'jpegPhoto',
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index e28081c4..81b9d610 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -369,7 +369,7 @@ class posixAccount extends baseModule implements passwordService {
 			'user' => array(
 				'uid' => array(
 					"Headline" => _("User name"), 'attr' => 'uid',
-					"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters.")
+					"Text" => _("User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, @.-_. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters.")
 				),
 				'gecos' => array(
 					"Headline" => _("Gecos"),