--- loncom/interface/Attic/londropadd.pm	2007/10/09 17:33:57	1.171
+++ loncom/interface/Attic/londropadd.pm	2007/10/11 02:16:25	1.172
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.171 2007/10/09 17:33:57 raeburn Exp $
+# $Id: londropadd.pm,v 1.172 2007/10/11 02:16:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2757,11 +2757,13 @@ sub handler {
         my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
         my ($jsback,$elements) = &Apache::loncreateuser::crumb_utilities();
         my $jscript = '<script type="text/javascript">'.$jsback.'</script>';
+	&Apache::loncreateuser::restore_prev_selections();
+	my $srch;
+	foreach my $item (@search) {
+	    $srch->{$item} = $env{'form.'.$item};
+	}
+
         if ($env{'form.state'} eq 'gotusername') {
-            my $srch;
-            foreach my $item (@search) {
-                $srch->{$item} = $env{'form.'.$item};
-            }
             if ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) =
                     &Apache::loncreateuser::user_search_result($srch);
@@ -2811,7 +2813,7 @@ sub handler {
                 &print_enroll_single_student_form($r,$jscript,$ccuname,
                                                   $ccdomain,$srch);
             } else {
-                &get_student_username_domain_form($r,$elements);
+                &get_student_username_domain_form($r,$elements,undef,$srch);
             }
         } elsif ($env{'form.state'} eq 'enrolling') {
             $r->print(&header($jscript));
@@ -2832,7 +2834,7 @@ sub handler {
                                                       'Course_Add_Student'));
             &enroll_single_student($r,\@search);
         } else {
-            &get_student_username_domain_form($r,$elements);
+            &get_student_username_domain_form($r,$elements,undef,$srch);
         }
     } elsif ($env{'form.action'} eq 'classlist' && $permission->{'view'}) {
         $r->print(&header());