--- loncom/interface/lonpickcourse.pm	2016/10/19 13:14:05	1.120
+++ loncom/interface/lonpickcourse.pm	2016/11/02 22:41:18	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.120 2016/10/19 13:14:05 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.122 2016/11/02 22:41:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -410,15 +410,17 @@ sub display_matched_courses {
             my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' ';
+            my $possrole;
             my $menuchk = ' checked="checked" ';
             $r->print(
                 '<div class="LC_left_float">'
                .'<fieldset>'
-               .'<legend>'.&mt('Pick action').'</legend>'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'
-               .'&nbsp;');
+               .'<legend>'.&mt('Pick action').'</legend>');
+            my $roleradio = '<span class="LC_nobreak"><label>'.
+                            '<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'.'&nbsp;';
             if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                $possrole = 1;
+                $r->print($roleradio);
                 if ($type eq 'Community') {
                     $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
                 } elsif ($type eq 'Placement') {
@@ -429,7 +431,9 @@ sub display_matched_courses {
             } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
                 my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
                                                                   'adhocroles.'.$crsdom);
-                if (keys(%adhocroles)) {
+                if ($adhocroles{'adhocroles.'.$crsdom} ne '') {
+                    $possrole = 1;
+                    $r->print($roleradio);
                     my @adhoc = split(/,/,$adhocroles{'adhocroles.'.$crsdom});
                     if (@adhoc > 1) {
                         my %adhochash;
@@ -453,12 +457,15 @@ sub display_matched_courses {
                         } else {
                             $r->print(&mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]));
                         }
+                        $r->print('<input type="hidden" name="adhocrole" value="'.$adhoc[0].'" />');
                     }
                 }
             }
-            $r->print('</label></span><br />'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($possrole) { 
+                $r->print('</label></span><br />');
+            }
+            $r->print('<span class="LC_nobreak"><label>'
+                     .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
             if (&Apache::lonnet::allowed('ccc',$crsdom)) {
                 if ($type eq 'Community') {
                     $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));