--- loncom/auth/lonlogin.pm	2021/10/06 19:28:55	1.188
+++ loncom/auth/lonlogin.pm	2021/10/08 14:45:45	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.188 2021/10/06 19:28:55 raeburn Exp $
+# $Id: lonlogin.pm,v 1.190 2021/10/08 14:45:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,9 @@ sub handler {
         (!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
         &Apache::lonacc::get_posted_cgi($r,['linkkey']);
     }
+    if ($env{'form.firsturl'} eq '/adm/logout') {
+        delete($env{'form.firsturl'});
+    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -807,11 +810,11 @@ HEADER
             $ssologin = $samlssourl;
         }
         if ($env{'form.firsturl'} ne '') {
-            my $querystring;
+            my $querystring = 'origurl=';
             if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
-                $querystring = &uri_escape_utf8($env{'form.firsturl'});
+                $querystring .= &uri_escape_utf8($env{'form.firsturl'});
             } else {
-                $querystring = &uri_escape($env{'form.firsturl'});
+                $querystring .= &uri_escape($env{'form.firsturl'});
             }
             $querystring = &HTML::Entities::encode($querystring,"'");
             $ssologin .= (($ssologin=~/\?/)?'&':'?') . $querystring;