--- loncom/auth/lonroles.pm	2013/08/12 20:51:29	1.269.2.12
+++ loncom/auth/lonroles.pm	2014/01/13 03:56:42	1.269.2.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.12 2013/08/12 20:51:29 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.15 2014/01/13 03:56:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -551,13 +551,14 @@ ENDENTERKEY
                             }
                         }
 			if (($env{'form.orgurl'}) && 
-			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
+			    ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
+                            ($env{'form.orgurl'} ne '/adm/roles')) {
 			    my $dest=$env{'form.orgurl'};
                             if ($env{'form.symb'}) {
                                 if ($dest =~ /\?/) {
                                     $dest .= '&';
                                 } else {
-                                    $dest .= '?'
+                                    $dest .= '?';
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
@@ -746,7 +747,6 @@ ENDENTERKEY
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
     my $funcs = &get_roles_functions($showcount);
-    my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
@@ -2746,7 +2746,7 @@ sub get_roles_functions {
         }
     }
     if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
-        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course Catalog')]);
+        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
     }
     my $funcs = &Apache::lonhtmlcommon::start_funclist();
     foreach my $link (@links) {