--- loncom/auth/lonroles.pm	2022/06/26 04:03:47	1.365
+++ loncom/auth/lonroles.pm	2022/10/05 16:11:26	1.367
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.365 2022/06/26 04:03:47 raeburn Exp $
+# $Id: lonroles.pm,v 1.367 2022/10/05 16:11:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1040,7 +1040,7 @@ ENDCLOSE
                                         if ($env{'form.ttoken'}) {
                                             $dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'};
                                         }
-                                        unless ($env{'request.lti.login'}) {
+                                        unless (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
                                             $msg = '<p>'.&mt('Entering [_1] ...',
                                                              $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                                    '</p>';
@@ -1130,6 +1130,12 @@ ENDCLOSE
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
+                        if ($env{'form.orgurl'} =~ /^\Q$redirect_url\E/) {
+                            my ($path) = ($env{'form.orgurl'} =~ m{^(.+)/[^/]+$});
+                            if (($path ne '') && (-e $Apache::lonnet::perlvar{'lonDocRoot'}.$path)) {
+                                $redirect_url = $env{'form.orgurl'};
+                            }
+                        }
                         &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;