--- loncom/auth/migrateuser.pm	2020/03/15 23:04:11	1.46
+++ loncom/auth/migrateuser.pm	2020/10/22 19:23:22	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.46 2020/03/15 23:04:11 raeburn Exp $
+# $Id: migrateuser.pm,v 1.48 2020/10/22 19:23:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -659,6 +659,20 @@ sub handler {
         } else {
             $extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} };
         }
+    } elsif (($data{'server'}) && ($data{'otherbalcookie'})) {
+        my ($balancer,$balcookie) = split(/:/,$data{'otherbalcookie'});
+        if (defined(&Apache::lonnet::hostname($balancer)) && $balcookie =~ /^[a-f0-9]{32}$/) {
+            my $baldom = &Apache::lonnet::host_domain($balancer);
+            if (&Apache::lonnet::shared_institution($baldom)) {
+                my $cookieid = join('_',$udom,$data{'username'},$balcookie);
+                &Apache::lonnet::updatebalcookie($cookieid,$balancer,$data{'server'});
+                if (ref($extra_env) eq 'HASH') {
+                    $extra_env->{'request.balancercookie'} = $data{'otherbalcookie'};
+                } else {
+                    $extra_env = { 'request.balancercookie' => $data{'otherbalcookie'} };
+                }
+            }
+        }
     }
 
     if (($data{'conlost'}) && ($data{'server'})) {
@@ -827,14 +841,24 @@ sub handler {
 	    }
 	} else {
             my $desturl = '/adm/roles';
-            if ($data{'origurl'} ne '') {
-                $desturl = $data{'origurl'};
-                if ($data{'lti.login'}) {
-                    $desturl = $data{'origurl'};
+            if ($data{'lti.login'}) { 
+                if ($data{'lti.selfenrollrole'}) {
+                    $desturl .= '?selectrole=1&'.
+                                &escape($data{'lti.selfenrollrole'}).'=1';
+                    if ($data{'origurl'} ne '') {
+                        $desturl .= '&orgurl='.$data{'origurl'};
+                        if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) {
+                            $desturl .= '&navmap=1';
+                        }  
+                    }
+                } elsif ($data{'origurl'} ne '') {
+                    $desturl = $data{'origurl'}; 
                     if ($desturl =~ m{/default_\d+\.sequence$}) {
                         $desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1';
                     }
                 }
+            } elsif ($data{'origurl'} ne '') {
+                $desturl = $data{'origurl'};
                 if ($data{'linkprot'}) {
                     my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2);
                     if ($linkprotector) {