Index: server/common/oursrc/accountadm/configure.in
===================================================================
--- server/common/oursrc/accountadm/configure.in	(revision 432)
+++ server/common/oursrc/accountadm/configure.in	(revision 435)
@@ -42,4 +42,6 @@
 LOCATE(setquota)
 LOCATE(hesinfo)
+LOCATE(sort)
+LOCATE(head)
 
 dnl Needed by mbash.in
Index: server/common/oursrc/accountadm/signup-scripts-backend.in
===================================================================
--- server/common/oursrc/accountadm/signup-scripts-backend.in	(revision 432)
+++ server/common/oursrc/accountadm/signup-scripts-backend.in	(revision 435)
@@ -31,7 +31,7 @@
 
 my $homedir;
-my $filsys = `@hesinfo_path@ $username filsys`;
+my $filsys = `@hesinfo_path@ $username filsys | @sort_path@ -nk5 | @head_path@ -n1`;
 # AFS /afs/athena.mit.edu/user/j/b/jbarnold w /mit/jbarnold
-if($filsys =~ /^AFS\s(\/afs\/[\w\._\/-]+)\s.*\s\/mit\/$username$/) {
+if($filsys =~ /^AFS\s(\/afs\/[\w\._\/-]+)\s.*\s\/mit\/$username(?: [0-9]+)?$/) {
 	$homedir = $1;
 }
@@ -67,5 +67,5 @@
 # Add user to /etc/passwd
 `@sudo_path@ -u root @groupadd_path@ -g '$gid1' '$username'`;
-`@sudo_path@ -u root @useradd_path@ -d '$homedir' -s '/usr/local/bin/mbash' -u '$uid1' -g '$gid1' -G users '$username'`;
+`@sudo_path@ -u root @useradd_path@ -M -d '$homedir' -s '/usr/local/bin/mbash' -u '$uid1' -g '$gid1' -G users '$username'`;
 # Add disk quota for user
 `@sudo_path@ -u root @setquota_path@ '$username' 0 25000 0 10000 -a`;