diff --git a/cluster-webmin/save_group.cgi b/cluster-webmin/save_group.cgi
index c323a6b77..6614e3693 100755
--- a/cluster-webmin/save_group.cgi
+++ b/cluster-webmin/save_group.cgi
@@ -15,7 +15,7 @@ foreach $h (@allhosts) {
 	}
 
 # Validate inputs
-$in{'name'} =~ /^[A-z0-9\-\_\.]+$/ ||
+$in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ ||
 	&error(&text('group_ename', $in{'name'}));
 $in{'name'} ne $in{'old'} && $taken{$in{'name'}} &&
 	&error(&text('group_etaken', $in{'name'}));
diff --git a/cluster-webmin/save_user.cgi b/cluster-webmin/save_user.cgi
index 13896e8c6..3af853c4b 100755
--- a/cluster-webmin/save_user.cgi
+++ b/cluster-webmin/save_user.cgi
@@ -15,7 +15,7 @@ foreach $h (@allhosts) {
 	}
 
 # Validate inputs
-$in{'name'} =~ /^[A-z0-9\-\_\.]+$/ ||
+$in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ ||
 	&error(&text('user_ename', $in{'name'}));
 $in{'name'} ne $in{'old'} && $taken{$in{'name'}} &&
 	&error(&text('user_etaken', $in{'name'}));