Index: branches/locker-dev/locker/bin/signup-cron
===================================================================
--- branches/locker-dev/locker/bin/signup-cron	(revision 1533)
+++ branches/locker-dev/locker/bin/signup-cron	(revision 1534)
@@ -10,5 +10,5 @@
   fs sa /mit/$lname/cron_scripts daemon.scripts write
   DATE=`date`
-  signupuser=`echo "$principal" | sed 's/@.*$//'`
+  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
   sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/bin$scriptsdev/crontab | sed '/ATHENA_USER/s//'"$signupuser"'/g' | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
   echo "By default, output from cron jobs for the $lname locker will be mailed"
Index: branches/locker-dev/locker/bin/signup-mail
===================================================================
--- branches/locker-dev/locker/bin/signup-mail	(revision 1533)
+++ branches/locker-dev/locker/bin/signup-mail	(revision 1534)
@@ -9,5 +9,5 @@
   fs sa /mit/$lname/mail_scripts system:authuser none
   fs sa /mit/$lname/mail_scripts daemon.scripts read
-  signupuser=`echo "$principal" | sed 's/@.*$//'`
+  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
   sed /SCRIPTS_USER/s//$signupuser/ /mit/scripts/bin/procmailrc > /mit/$lname/mail_scripts/procmailrc
   echo "By default, mail sent to $lname@scripts.mit.edu will be forwarded to"