diff --git a/course/unenrol.php b/course/unenrol.php
index 03617c3e30d..7121f3c6778 100644
--- a/course/unenrol.php
+++ b/course/unenrol.php
@@ -62,7 +62,8 @@
                 error("An error occurred while trying to unenrol that person.");
             }
 
-            add_to_log($course->id, 'course', 'unenrol', "view.php?id=$course->id", $userid);
+            add_to_log($course->id, 'course', 'unenrol',
+                    "view.php?id=$course->id", $course->id);
             redirect($CFG->wwwroot.'/user/index.php?id='.$course->id);
 
         } else {
@@ -72,7 +73,8 @@
 
             // force a refresh of mycourses
             unset($USER->mycourses);
-            add_to_log($course->id, 'course', 'unenrol', "view.php?id=$course->id", $USER->id);
+            add_to_log($course->id, 'course', 'unenrol',
+                    "view.php?id=$course->id", $course->id);
 
             redirect($CFG->wwwroot);
         }
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 6f51b86db5d..60d4a0bbf62 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2981,7 +2981,8 @@ function enrol_into_course($course, $user, $enrol) {
 
         email_welcome_message_to_user($course, $user);
 
-        add_to_log($course->id, 'course', 'enrol', 'view.php?id='.$course->id, $user->id);
+        add_to_log($course->id, 'course', 'enrol',
+                'view.php?id='.$course->id, $course->id);
 
         return true;
     }
diff --git a/lib/db/install.xml b/lib/db/install.xml
index ddb23c5151e..9c5089f95c2 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1689,6 +1689,7 @@
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'view', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'update', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'enrol', 'course', 'fullname')" />
+        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'unenrol', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report log', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report live', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report outline', 'course', 'fullname')" />
@@ -1704,4 +1705,4 @@
       </SENTENCES>
     </STATEMENT>
   </STATEMENTS>
-</XMLDB>
\ No newline at end of file
+</XMLDB>
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index fbe1268941a..f4adbfc673f 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3002,6 +3002,19 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101512);
     }
 
+    if ($result && $oldversion < 2007101513) {
+        $log_action = new stdClass();
+        $log_action->module = 'course';
+        $log_action->action = 'unenrol';
+        $log_action->mtable = 'course';
+        $log_action->field  = 'fullname';
+        if (!record_exists("log_display", "action", "unenrol",
+                    "module", "course")){
+            $result  = $result && insert_record('log_display', $log_action);
+        }
+        upgrade_main_savepoint($result, 2007101513);
+    }
+
     return $result;
 }
 
diff --git a/version.php b/version.php
index 04f7288a7d2..aad10a0d51e 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101512;  // YYYYMMDD      = date of the 1.9 branch (don't change)
+    $version = 2007101513;  // YYYYMMDD      = date of the 1.9 branch (don't change)
                             //         X     = release number 1.9.[0,1,2,3...]
                             //          Y.YY = micro-increments between releases