diff --git a/course/lib.php b/course/lib.php
index 529705a0b2e..1ff0e9a1a23 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -17,11 +17,13 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
     $users = array();
 
     if ($course->category) {
-        if (!$users = get_course_users($course->id, "u.lastaccess DESC")) {
-            $users = array();
+        if ($courseusers = get_course_users($course->id, "u.lastaccess DESC")) {
+            foreach ($courseusers as $courseuser) {
+                $users[$courseuser->id] = "$courseuser->firstname $courseuser->lastname";
+            }
         }
         if ($guest = get_guest()) {
-            $users["$guest->id"] = "$guest->firstname $guest->lastname";
+            $users[$guest->id] = "$guest->firstname $guest->lastname";
         }
     }
 
diff --git a/course/log.php b/course/log.php
index 29450a2c0f7..7176f324530 100644
--- a/course/log.php
+++ b/course/log.php
@@ -26,6 +26,7 @@
     }
 
     $strlogs = get_string("logs");
+    $stradministration = get_string("administration");
 
 
     if ($user || $date) {
@@ -42,9 +43,15 @@
             $dateinfo = userdate($date, "%A, %d %B %Y");
         }
 
-        print_header("$course->shortname: $strlogs", "$course->fullname", 
-                     "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> ->
-                      <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        if ($course->category) {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                         "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> ->
+                          <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        } else {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                         "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> ->
+                          <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        }
         
         print_heading("$course->fullname: $userinfo, $dateinfo (".usertimezone().")");
 
@@ -53,8 +60,13 @@
         print_log($course, $user, $date, "ORDER BY l.time DESC");
 
     } else {
-        print_header("$course->shortname: $strlogs", "$course->fullname", 
-                 "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> -> $strlogs", "");
+        if ($course->category) {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                     "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> -> $strlogs", "");
+        } else {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                     "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> -> $strlogs", "");
+        }
 
         print_heading(get_string("chooselogs").":");