diff --git a/account/addpubkey.in b/account/addpubkey.in
index 31834f61eaf4e06421aff5f4fb3ebeaf515b5015..f7bf73420b7b4561047e0917bb2b3206d4634f95 100644
--- a/account/addpubkey.in
+++ b/account/addpubkey.in
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -wT
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2004 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use English;
@@ -126,7 +126,7 @@ $user = $ARGV[0];
 #
 # Untaint the arguments.
 #
-if ($user =~ /^([a-z0-9]+)$/i) {
+if ($user =~ /^([-\w]+)$/i) {
     $user = $1;
 }
 else {
diff --git a/account/addsfskey.in b/account/addsfskey.in
index 92e3d20d766ad8c570599c4834228b230b4c7b02..6fe38c5d6e1d53cd0ae1c5552f689719db638da0 100644
--- a/account/addsfskey.in
+++ b/account/addsfskey.in
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -wT
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2004 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use English;
@@ -104,7 +104,7 @@ $user = $ARGV[0];
 #
 # Untaint the arguments.
 #
-if ($user =~ /^([a-z0-9]+)$/i) {
+if ($user =~ /^([-\w]+)$/i) {
     $user = $1;
 }
 else {
diff --git a/account/tbacct.in b/account/tbacct.in
index aa5d954a8f7aeaec6d791d8bb3bf988d1a07e518..c3dcef346e438b5ff9eaf2ff3d49e76191ce6933 100644
--- a/account/tbacct.in
+++ b/account/tbacct.in
@@ -2,7 +2,7 @@
 
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2004 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use English;
@@ -122,7 +122,7 @@ my $user = $ARGV[1];
 #
 # Untaint the arguments.
 #
-if ($user =~ /^([a-z0-9]+)$/i) {
+if ($user =~ /^([-\w]+)$/i) {
     $user = $1;
 }
 else {