diff --git a/admin/auth.php b/admin/auth.php
index be6ca65e67f..f0fa055abdf 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -35,7 +35,6 @@
         }
 
         if (count($err) == 0) {
-            print_header();
             foreach ($config as $name => $value) {
                 if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
                     $plugin = "auth/$auth";
diff --git a/admin/backup.php b/admin/backup.php
index 2b8f16b8cde..1e757d129fe 100644
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -54,7 +54,6 @@
         $config = (object)$a_config;
         //weekdays conversions done. Continue
 
-        print_header();
         foreach ($config as $name => $value) {
             backup_set_config($name, $value);
         }
diff --git a/admin/block.php b/admin/block.php
index 1dd8e9a1c46..597530f56bb 100644
--- a/admin/block.php
+++ b/admin/block.php
@@ -47,7 +47,6 @@
             unset($config->$item);
         }
         $block->config_save($config);
-        print_header();
         redirect("$CFG->wwwroot/$CFG->admin/blocks.php", get_string("changessaved"), 1);
         exit;
     }
diff --git a/admin/config.php b/admin/config.php
index ff82e3728ac..a475513574e 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -30,7 +30,6 @@
         validate_form($config, $err);
 
         if (count($err) == 0) {
-            print_header();
             foreach ($config as $name => $value) {
                 if ($name == "sessioncookie") {
                     $value = eregi_replace("[^a-zA-Z]", "", $value);
diff --git a/admin/module.php b/admin/module.php
index f5c4522b2bd..6db11666368 100644
--- a/admin/module.php
+++ b/admin/module.php
@@ -37,8 +37,6 @@
             $moduleprefix = '';
         }
 
-        print_header();
-
         foreach ($config as $name => $value) {
             set_config($moduleprefix.$name, $value);
         }
diff --git a/calendar/preferences.php b/calendar/preferences.php
index a685104611f..b393fab5192 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -17,7 +17,6 @@
 /// If data submitted, then process and store.
 
     if ($form = data_submitted()) {
-        print_header();
         foreach ($form as $preference => $value) {
             switch ($preference) {
                 case 'timeformat':
diff --git a/course/delete.php b/course/delete.php
index 09df1d2c2b1..053b760e03d 100644
--- a/course/delete.php
+++ b/course/delete.php
@@ -40,6 +40,8 @@
         notice_yesno("$strdeletecoursecheck<br /><br />$course->fullname ($course->shortname)", 
                      "delete.php?id=$course->id&amp;delete=".md5($course->timemodified)."&amp;sesskey=$USER->sesskey", 
                      "category.php?id=$course->category");
+
+        print_footer($course);
         exit;
     }
 
diff --git a/course/teacher.php b/course/teacher.php
index 3ca3292c21b..9437897d33d 100644
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -55,16 +55,6 @@
     }
 
 
-
-/// Print headers
-
-    print_header("$course->shortname: $strassignteachers", 
-                 "$course->fullname", 
-                 "<a href=\"index.php\">$strcourses</a> -> ".
-                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> ".
-                 "$strassignteachers", "");
-
-
 /// If data submitted, then process and store.
 
     if ($form = data_submitted() and confirm_sesskey()) {
@@ -94,6 +84,15 @@
         redirect("teacher.php?id=$course->id", get_string("changessaved"));
     }
 
+
+/// Print headers
+
+    print_header("$course->shortname: $strassignteachers", 
+                 "$course->fullname", 
+                 "<a href=\"index.php\">$strcourses</a> -> ".
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> ".
+                 "$strassignteachers", "");
+
 /// Add a teacher if one is specified
 
     if (!empty($add) and confirm_sesskey()) {