diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index 21227b1b5742..7c5cd98119db 100644
--- a/usr.sbin/adduser/adduser.perl
+++ b/usr.sbin/adduser/adduser.perl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: adduser.perl,v 1.20 1996/11/20 01:07:46 wosch Exp $
+# $Id: adduser.perl,v 1.21 1996/11/27 22:04:55 ache Exp $
 
 
 # read variables
@@ -307,9 +307,9 @@ sub new_users_name {
     local($name);
 
     while(1) {
-	$name = &confirm_list("Enter username", 1, "a-z0-9", "");
-	if (length($name) > 8) {
-	    warn "Username is longer than 8 chars\a\n";
+	$name = &confirm_list("Enter username", 1, "A-Za-z0-9_", "");
+	if (length($name) > 16) {
+	    warn "Username is longer than 16 chars\a\n";
 	    next;
 	}
 	last if (&new_users_name_valid($name) eq $name);
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl
index d556eff2e35b..c55862a1acdd 100644
--- a/usr.sbin/adduser/rmuser.perl
+++ b/usr.sbin/adduser/rmuser.perl
@@ -30,7 +30,7 @@
 #
 # Guy Helmer <ghelmer@alpha.dsu.edu>, 07/17/96
 #
-#	$Id: removeuser.perl,v 1.2 1996/08/11 13:03:25 wosch Exp $
+#	$Id: rmuser.perl,v 1.1 1996/11/17 03:51:33 wosch Exp $
 
 sub LOCK_SH {0x01;}
 sub LOCK_EX {0x02;}
@@ -231,8 +231,8 @@ sub get_login_name {
 	chop $login_name;
 	if (!($login_name =~ /[A-Za-z0-9_]/)) {
 	    print STDERR "Sorry, login name must contain alphanumeric characters only.\n";
-	} elsif (length($login_name) > 8 || length($login_name) == 0) {
-	    print STDERR "Sorry, login name must be eight characters or less.\n";
+	} elsif (length($login_name) > 16 || length($login_name) == 0) {
+	    print STDERR "Sorry, login name must be 16 characters or less.\n";
 	} else {
 	    $done = 1;
 	}