diff --git a/course/grade.php b/course/grade.php
index 26274c221ff..31066372cca 100644
--- a/course/grade.php
+++ b/course/grade.php
@@ -3,7 +3,6 @@
 
 	require("../config.php");
 	require("lib.php");
-    require("../lib/psxlsgen.php");
 
     require_variable($id);              // course id
 
diff --git a/course/lib.php b/course/lib.php
index 9eff089bbc7..529705a0b2e 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -623,38 +623,42 @@ function print_admin_links ($siteid, $width=180) {
 }
 
 function print_course_admin_links($course, $width=180) {
-    global $THEME, $CFG;
+    global $USER, $THEME, $CFG;
 
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    if (isediting($course->id)) {
-        $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
+    if (isteacher($course->id)) {
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+        if (isediting($course->id)) {
+            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
+        } else {
+            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">".get_string("turneditingon")."</A>";
+        }
+        $admindata[]="<A HREF=\"edit.php?id=$course->id\">".get_string("settings")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+        if (!$course->teachers) {
+            $course->teachers = get_string("defaultcourseteachers");
+        }
+        $admindata[]="<A HREF=\"teachers.php?id=$course->id\">$course->teachers...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    
+        $admindata[]="<A HREF=\"grades.php?id=$course->id\">".get_string("grades")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/grades.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    
+        $admindata[]="<A HREF=\"log.php?id=$course->id\">".get_string("logs")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+        $admindata[]="<A HREF=\"$CFG->wwwroot/files/index.php?id=$course->id\">".get_string("files")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    
+        $admindata[]="<A HREF=\"$CFG->wwwroot/doc/view.php?id=$course->id&file=teacher.html\">".get_string("help")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/resource/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+
+        if ($teacherforum = forum_get_course_forum($course->id, "teacher")) {
+            $admindata[]="<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$teacherforum->id\">".get_string("nameteacher", "forum")."</A>";
+            $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+        }
     } else {
-        $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">".get_string("turneditingon")."</A>";
-    }
-    $admindata[]="<A HREF=\"edit.php?id=$course->id\">".get_string("settings")."...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    if (!$course->teachers) {
-        $course->teachers = get_string("defaultcourseteachers");
-    }
-    $admindata[]="<A HREF=\"teachers.php?id=$course->id\">$course->teachers...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-    $admindata[]="<A HREF=\"grades.php?id=$course->id\">".get_string("grades")."...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/grades.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-    $admindata[]="<A HREF=\"log.php?id=$course->id\">".get_string("logs")."...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    $admindata[]="<A HREF=\"$CFG->wwwroot/files/index.php?id=$course->id\">".get_string("files")."...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-    $admindata[]="<A HREF=\"$CFG->wwwroot/doc/view.php?id=$course->id&file=teacher.html\">".get_string("help")."...</A>";
-    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/resource/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-
-    if ($teacherforum = forum_get_course_forum($course->id, "teacher")) {
-        $admindata[]="<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$teacherforum->id\">".get_string("nameteacher", "forum")."</A>";
-        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    }
+        $admindata[]="<A HREF=\"grade.php?id=$course->id\">".get_string("grades")."...</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/grades.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    } 
 
     print_side_block(get_string("administration"), "", $admindata, $adminicon, "", $width);
 }
diff --git a/course/social.php b/course/social.php
index b7cb0ebdae3..c6e76577fa9 100644
--- a/course/social.php
+++ b/course/social.php
@@ -46,9 +46,7 @@
       print_side_block(get_string("search","forum"), $searchform, "", "", "", $leftwidth);
 
 /// Admin links and controls
-      if (isteacher($course->id)) {
-          print_course_admin_links($course, "100%", $leftwidth);
-      }
+      print_course_admin_links($course);
 
       echo "</TD>";
 
diff --git a/course/topics.php b/course/topics.php
index ce65a11d196..e8d302bfbfe 100644
--- a/course/topics.php
+++ b/course/topics.php
@@ -70,9 +70,7 @@
     print_side_block(get_string("search","forum"), $searchform);
 
 /// Admin links and controls
-    if (isteacher($course->id)) {
-        print_course_admin_links($course);
-    }
+    print_course_admin_links($course);
 
 /// Start main column
     echo "</TD><TD WIDTH=\"*\">";
diff --git a/course/weeks.php b/course/weeks.php
index 820c19a8912..7a8455c3757 100644
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -61,9 +61,7 @@
     
 
 /// Admin links and controls
-    if (isteacher($course->id)) {
-        print_course_admin_links($course);
-    }
+    print_course_admin_links($course);
 
 
 /// Start main column