--- loncom/auth/lonlogin.pm	2017/09/25 00:36:30	1.171
+++ loncom/auth/lonlogin.pm	2018/01/12 15:26:39	1.172
@@ -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.172 2018/01/12 15:26:39 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'})) {