diff --git a/course/category.php b/course/category.php
index da96a8108cd..831d876c358 100644
--- a/course/category.php
+++ b/course/category.php
@@ -411,7 +411,7 @@
         $strrename= get_string("rename");
         echo '<form name="renameform" action="category.php" method="post">';
         echo '<input type="hidden" name="id" value="'.$category->id.'" />';
-        echo '<input type="text" size="30" name="rename" value="'.s($category->name).'" />';
+        echo '<input type="text" size="30" name="rename" value="'.s($category->name).'" alt="'.$strrename.'" />';
         echo '<input type="submit" value="'.$strrename.'" />';
         echo "</form>";
         echo "<br />";
diff --git a/course/lib.php b/course/lib.php
index 38e5ba86565..8ceea5b608a 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1282,7 +1282,9 @@ function print_course($course, $width="100%") {
     echo $enrol->get_access_icons($course);
 
     echo '</td><td valign="top" width="50%" class="courseboxsummary">';
-    echo '<p><font size="2">'.filter_text(text_to_html($course->summary), $course->id).'</font></p>';
+    $options = NULL;
+    $options->noclean = true;
+    echo format_text($course->summary, FORMAT_MOODLE, $options,  $course->id);
     echo "</td></tr>";
     echo "</table>";