--- loncom/auth/lonlogin.pm	2017/09/25 00:36:30	1.171
+++ loncom/auth/lonlogin.pm	2018/07/04 16:58:19	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.171 2017/09/25 00:36:30 raeburn Exp $
+# $Id: lonlogin.pm,v 1.173 2018/07/04 16:58:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,11 @@ sub handler {
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
+    if (!defined($env{'form.firsturl'})) {
+        if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) {
+            $env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
+        }
+    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -81,10 +86,14 @@ sub handler {
                                 -expires => '-10y',);
         $r->header_out('Set-cookie' => $c);
     } elsif (($handle eq '') && ($userdom ne '')) {
-        my $c = new CGI::Cookie(-name    => 'lonID',
-                                -value   => '',
-                                -expires => '-10y',);
-        $r->headers_out->add('Set-cookie' => $c);
+        my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+        foreach my $name (keys(%cookies)) {
+            next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
+            my $c = new CGI::Cookie(-name    => $name,
+                                    -value   => '',
+                                    -expires => '-10y',);
+            $r->headers_out->add('Set-cookie' => $c);
+        }
     }
     $r->send_http_header;
     return OK if $r->header_only;