--- loncom/auth/switchserver.pm	2021/08/11 17:03:03	1.58
+++ loncom/auth/switchserver.pm	2022/06/18 02:10:18	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.58 2021/08/11 17:03:03 raeburn Exp $
+# $Id: switchserver.pm,v 1.60 2022/06/18 02:10:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -97,7 +97,7 @@ sub flush_course_logs {
 
 sub handler {
     my ($r) = @_;
-    
+
     my $handle=&init_env($r);
     if (!defined($handle)) { return FORBIDDEN; }
 
@@ -312,7 +312,10 @@ sub handler {
     }
     if ($env{'request.linkprot'}) {
         $info{'linkprot'} = $env{'request.linkprot'};
-    } elsif ($env{'request.linkkey'}) {
+        if ($env{'request.linkprotuser'}) {
+            $info{'linkprotuser'} = $env{'request.linkprotuser'};
+        }
+    } elsif ($env{'request.linkkey'} ne '') {
         $info{'linkkey'} = $env{'request.linkkey'};
     }
     if ($env{'request.deeplink.login'}) {