--- loncom/interface/loncreateuser.pm	2006/05/30 20:12:15	1.119
+++ loncom/interface/loncreateuser.pm	2006/06/02 13:58:31	1.120
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.119 2006/05/30 20:12:15 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.120 2006/06/02 13:58:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -246,8 +246,8 @@ sub print_user_modification_page {
         my @rolevals = ('st','ta','ep','in','cc');
         my (@crsroles,@grproles);
         for (my $i=0; $i<@rolevals; $i++) {
-            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i]);
-            $grproles[$i]=&Apache::loncommon::convert_role($crsroles[$i],'Group');
+            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
+            $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
         }
         my $rolevalslist = join('","',@rolevals);
         my $crsrolenameslist = join('","',@crsroles);
@@ -705,10 +705,7 @@ END
                }
 	       my $plaintext='';
 	       unless ($croletitle) {
-		   $plaintext=&Apache::lonnet::plaintext($role_code);
-                   if ($class eq 'Group') {
-                       $plaintext = &Apache::loncommon::convert_role($plaintext,$class);
-                   }
+                   $plaintext=&Apache::lonnet::plaintext($role_code,$class)
 	       } else {
 	           $plaintext=
 		"Customrole '$croletitle' defined by $croleuname\@$croleudom";