--- loncom/auth/lonroles.pm	2018/05/28 23:26:12	1.338
+++ loncom/auth/lonroles.pm	2018/12/08 15:16:03	1.340
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.338 2018/05/28 23:26:12 raeburn Exp $
+# $Id: lonroles.pm,v 1.340 2018/12/08 15:16:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,6 +272,12 @@ sub handler {
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
+        if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq '')) {
+            if ($env{'form.ltitarget'} eq 'iframe') {
+                &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+                delete($env{'form.ltitarget'});
+            }
+        }
 
         my $locknum=&Apache::lonnet::get_locks();
         if ($locknum) { return 409; }
@@ -1360,8 +1366,8 @@ sub gather_roles {
                     if (!$allowed) {
                         $button=0;
                         unless ($trustchecked{$tdom}) {
-                            if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
-                                (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
+                            if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
+                                (&Apache::lonnet::will_trust('coremau',$tdom,$env{'user.domain'}))) {
                                 $willtrust{$tdom} = 1;
                                 $trustchecked{$tdom} = 1;
                             }