diff --git a/mod/assign/index.php b/mod/assign/index.php
index f072009bbf2..bc6d798aa6e 100644
--- a/mod/assign/index.php
+++ b/mod/assign/index.php
@@ -40,6 +40,7 @@ $PAGE->navbar->add($strplural);
 $PAGE->set_title($strplural);
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($strplural));
 
 $context = context_course::instance($course->id);
 
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index f3a0306262f..f9058c879f5 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -221,14 +221,14 @@ class mod_assign_renderer extends plugin_renderer_base {
         }
 
         $this->page->set_title(get_string('pluginname', 'assign'));
-        $this->page->set_heading($header->assign->name);
+        $this->page->set_heading($this->page->course->fullname);
 
         $o .= $this->output->header();
+        $heading = format_string($header->assign->name, false, array('context' => $header->context));
+        $o .= $this->output->heading($heading);
         if ($header->preface) {
             $o .= $header->preface;
         }
-        $heading = format_string($header->assign->name, false, array('context' => $header->context));
-        $o .= $this->output->heading($heading);
 
         if ($header->showintro) {
             $o .= $this->output->box_start('generalbox boxaligncenter', 'intro');