--- loncom/auth/migrateuser.pm	2018/04/14 01:50:43	1.28
+++ loncom/auth/migrateuser.pm	2018/04/15 00:14:19	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.28 2018/04/14 01:50:43 raeburn Exp $
+# $Id: migrateuser.pm,v 1.30 2018/04/15 00:14:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,6 +88,12 @@ sub lti_check {
             if ($data->{'lti.selfenrollrole'}) {
                 $lti_env{'request.lti.selfenrollrole'} = $data->{'lti.selfenrollrole'};
             }
+            if ($data->{'lti.uri'}) {
+                $lti_env{'request.lti.uri'} = $data->{'lti.uri'};
+            }
+            if ($data->{'lti.target'}) {
+                $lti_env{'request.lti.target'} = $data->{'lti.target'};
+            }
         }
         if ($data->{'lti.passbackid'}) {
             $lti_env{'request.lti.passbackid'} = $data->{'lti.passbackid'};
@@ -388,6 +394,7 @@ sub handler {
                     $form{'lti.reqcrs'} = $data{'lti.reqcrs'};
                     $form{'lti.reqrole'} = $data{'lti.reqrole'};
                     $form{'lti.sourcecrs'} = $data{'lti.sourcecrs'};
+                    $form{'lti.uri'} = $data{'lti.uri'};
                     if ($data{'lti.passbackid'}) {
                         $form{'lti.passbackid'} = $data{'lti.passbackid'};
                     }
@@ -400,6 +407,9 @@ sub handler {
                     if ($data{'lti.rosterurl'}) {
                         $form{'lti.rosterurl'} = $data{'lti.rosterurl'};
                     }
+                    if ($data{'lti.target'}) {
+                        $form{'lti.target'} = $data{'lti.target'};
+                    }
                     &Apache::loncommon::content_type($r,'text/html');
                     $r->send_http_header;
                     &Apache::ltiauth::lti_reqcrs($r,$data{'domain'},\%form,$data{'username'},$data{'domain'});
@@ -473,6 +483,11 @@ sub handler {
     my $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$}) {
+                $next_url .= '&navmap=1';
+            }
+        }
     }
     &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
 			      $next_url,$extra_env,\%form);