--- loncom/auth/migrateuser.pm	2007/01/12 15:44:27	1.10
+++ loncom/auth/migrateuser.pm	2008/03/24 04:56:07	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.10 2007/01/12 15:44:27 raeburn Exp $
+# $Id: migrateuser.pm,v 1.13 2008/03/24 04:56:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,9 @@ sub handler {
     
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
     my %data =   &Apache::lonnet::tmpget($env{'form.token'});
+    if (keys(%data) == 0) {
+        return &goto_login($r);
+    }
     my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
 
     &Apache::lonlocal::get_language_handle($r);
@@ -87,9 +90,22 @@ sub handler {
     my $extra_env = &sso_check(\%data);
 
     if (!$data{'role'}) {
-	&Apache::lonauth::success($r,$data{'username'},$data{'domain'},
-				  $home,'/adm/roles',$extra_env);
+	my $handle = &Apache::lonnet::check_for_valid_session($r);
+	if ($handle) {
+	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+						     $handle);
+	    if ($env{'request.course.id'}) {
+		$r->internal_redirect('/adm/navmaps');
+	    } else {
+		$r->internal_redirect('/adm/roles');
+	    }
+	} else {
+	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
+				      $home,'/adm/roles',$extra_env);
+
+	}
 	return OK;
+
     }
 
     my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';