--- loncom/auth/migrateuser.pm	2022/02/06 21:37:04	1.57
+++ loncom/auth/migrateuser.pm	2022/03/29 19:12:04	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.57 2022/02/06 21:37:04 raeburn Exp $
+# $Id: migrateuser.pm,v 1.59 2022/03/29 19:12:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -722,20 +722,14 @@ sub handler {
 						     $handle);
             my $checklaunch;
             if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                if ($env{'request.linkprot'} ne '') {
-                     unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
-                         $checklaunch = 1;
-                     }
-                }
-                if ($env{'request.linkkey'} ne '') {
-                    unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
-                        $checklaunch = 1;
-                    }
+                unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
+                    $checklaunch = 1;
                 }
-                if ($env{'request.deeplink.login'}) {
-                    unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
-                        $checklaunch = 1;
-                    }
+                unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
+                    $checklaunch = 1;
+                }
+                unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
+                    $checklaunch = 1;
                 }
             }
             if ($data{'linkprot'} ne '') {
@@ -1018,16 +1012,18 @@ sub handler {
     }
     if ($reuse_session) {
         $r->internal_redirect($next_url);
-    } elsif ($data{'deeplink.login'}) {
-        if (ref($extra_env) eq 'HASH') {
-            $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
-        } else {
-            $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
-        }
-        if ($data{'linkprot'}) {
-            $extra_env->{'request.linkprot'} = $data{'linkprot'};
-        } elsif ($data{'linkkey'} ne '') {
-            $extra_env->{'request.linkkey'} = $data{'linkkey'};
+    } else {
+        if ($data{'deeplink.login'}) {
+            if (ref($extra_env) eq 'HASH') {
+                $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
+            } else {
+                $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
+            }
+            if ($data{'linkprot'}) {
+                $extra_env->{'request.linkprot'} = $data{'linkprot'};
+            } elsif ($data{'linkkey'} ne '') {
+                $extra_env->{'request.linkkey'} = $data{'linkkey'};
+            }
         }
         &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
                                   $next_url,$extra_env,\%form,'',$cid);