--- loncom/auth/migrateuser.pm	2022/03/29 19:12:04	1.59
+++ loncom/auth/migrateuser.pm	2022/05/21 06:28:35	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.59 2022/03/29 19:12:04 raeburn Exp $
+# $Id: migrateuser.pm,v 1.60 2022/05/21 06:28:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -999,15 +999,26 @@ sub handler {
     } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
         $next_url=$data{'origurl'};
     } else {
-        $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
-        if ($data{'origurl'} ne '') {
-            $next_url .= '&orgurl='.&escape($data{'origurl'});
+        if ($data{'lti.login'}) {
+            $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+            if ($data{'origurl'} ne '') {
+                $next_url .= '&orgurl='.&escape($data{'origurl'});
+            }
+        } else {
+            $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+            if ($data{'origurl'} ne '') {
+                $next_url .= '&orgurl='.&escape($data{'origurl'});
+            }
         }
     }
     if ($data{'lti.login'}) {
         if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
             ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
-            $next_url .= '&navmap=1';
+            if ($reuse_session) {
+                $next_url .= '&navmap=1';
+            } else {
+                $next_url .= '&navmap=1';
+            }
         }
     }
     if ($reuse_session) {