Index: locker/deploy/bin/onathena
===================================================================
--- locker/deploy/bin/onathena	(revision 524)
+++ locker/deploy/bin/onathena	(revision 733)
@@ -63,6 +63,5 @@
 read whofor
 if [ "$whofor" = 1 ]; then
-    lname=$USER
-    lroot=$HOME 
+    lname="${ATHENA_USER:-$USER}"
 elif [ "$whofor" = 2 ]; then
     echo
@@ -73,5 +72,4 @@
     printf "Locker name: "
     read lname
-    lroot="/mit/$lname" 
 else
     echo
@@ -80,4 +78,13 @@
     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
+lroot="/mit/$lname" 
 
 echo