Index: locker/bin/signup-minimal
===================================================================
--- locker/bin/signup-minimal	(revision 726)
+++ locker/bin/signup-minimal	(revision 733)
@@ -25,6 +25,5 @@
     read whofor
     if [ "$whofor" = 1 ]; then
-        lname=$USER
-        lroot=$HOME
+        lname="${ATHENA_USER:-$USER}"
     elif [ "$whofor" = 2 ]; then
         echo
@@ -32,13 +31,6 @@
         echo "Please enter the name of the selected locker below."
         echo "(For the locker /mit/sipb, you would enter sipb)."
-        while true; do
-	    printf "Locker name: "
-	    read lname
-	    if attach "$lname"; then
-		break
-	    fi
-	    echo "$lname is not a valid locker name."
-        done
-        lroot="/mit/$lname"
+        printf "Locker name: "
+        read lname
     else
         echo
@@ -47,8 +39,17 @@
         exit 1
     fi
+    while true; do
+        if attach "$lname"; then
+            break
+        fi
+        echo "$lname is not a valid locker name."
+        printf "Locker name: "
+        read lname
+    done
   else
-    lname=$1
+    lname="$1"
   fi
 fi
+lroot="/mit/$lname" 
 
 attach "$lname" 2>/dev/null