diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 1b8ea47ce39..b2b720b1d76 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -58,7 +58,8 @@ require_login($course->id, true, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:managewiki', $context);
-add_to_log($course->id, "wiki", "admin", "admin.php?id=$cm->id", "$wiki->id");
+
+add_to_log($course->id, "wiki", "admin", "admin.php?pageid=".$page->id, $page->id, $cm->id);
 
 //Delete page if a page ID to delete was supplied
 if (!empty($delete) && confirm_sesskey()) {
diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index a2699044e88..3032dba5080 100644
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -59,7 +59,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, 'wiki', 'comments', 'comments.php?id=' . $cm->id, $wiki->id);
+add_to_log($course->id, 'wiki', 'comments', "comments.php?pageid=".$pageid, $pageid, $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_comments($wiki, $subwiki, $cm);
diff --git a/mod/wiki/create.php b/mod/wiki/create.php
index 19e571f2259..d9e8d2d8d0e 100644
--- a/mod/wiki/create.php
+++ b/mod/wiki/create.php
@@ -66,8 +66,6 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, 'createpage', 'createpage', 'view.php?id=' . $cm->id, $wiki->id);
-
 $wikipage = new page_wiki_create($wiki, $subwiki, $cm);
 
 if (!empty($swid)) {
@@ -80,22 +78,25 @@ if (!empty($swid)) {
     $wikipage->set_uid($uid);
 }
 
-if (!empty($title)) {
-    $wikipage->set_title($title);
-} else {
-    $wikipage->set_title(get_string('newpage', 'wiki'));
+if (empty($title)) {
+    $title = get_string('newpage', 'wiki');
 }
+$wikipage->set_title($title);
 
 // set page action, and initialise moodle form
 $wikipage->set_action($action);
 
 switch ($action) {
 case 'create':
-    $wikipage->create_page($title);
+    $newpageid = $wikipage->create_page($title);
+    add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=".$newpageid, $newpageid, $cm->id);
+    redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid='.$newpageid);
     break;
 case 'new':
     if ((int)$wiki->forceformat == 1 && !empty($title)) {
-        $wikipage->create_page($title);
+        $newpageid = $wikipage->create_page($title);
+        add_to_log($course->id, 'wiki', 'add page', "view.php?pageid=".$newpageid, $newpageid, $cm->id);
+        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid='.$newpageid);
     } else {
         // create link from moodle navigation block without pagetitle
         $wikipage->print_header();
diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index cf620960c65..c5eed893598 100644
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -67,13 +67,14 @@ if ($compare >= $comparewith) {
 }
 
 require_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "diff", "diff.php?id=$cm->id", "$wiki->id");
 
 $wikipage = new page_wiki_diff($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 $wikipage->set_comparison($compare, $comparewith);
 
+add_to_log($course->id, "wiki", "diff", "diff.php?pageid=".$pageid."&comparewith=".$comparewith."&compare=".$compare, $pageid, $cm->id);
+
 $wikipage->print_header();
 
 $wikipage->print_content();
diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index f750718976e..7be82afcb38 100644
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -77,8 +77,6 @@ require_login($course, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:editpage', $context);
 
-add_to_log($course->id, 'wiki', 'edit', "edit.php?id=$cm->id", "$wiki->id");
-
 if ($option == get_string('save', 'wiki')) {
     if (!confirm_sesskey()) {
         print_error(get_string('invalidsesskey', 'wiki'));
@@ -87,6 +85,7 @@ if ($option == get_string('save', 'wiki')) {
     $wikipage->set_page($page);
     $wikipage->set_newcontent($newcontent);
     $wikipage->set_upload(true);
+    add_to_log($course->id, 'wiki', 'edit', "view.php?pageid=".$pageid, $pageid, $cm->id);
 } else {
     if ($option == get_string('preview')) {
         if (!confirm_sesskey()) {
diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index 3b8a344c396..59851b1e2a8 100644
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -61,7 +61,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
-add_to_log($course->id, 'wiki', 'history', 'history.php?id=' . $cm->id, $wiki->id);
+add_to_log($course->id, 'wiki', 'history', "history.php?pageid=".$pageid, $pageid, $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_history($wiki, $subwiki, $cm);
diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index d1db74a22d9..7f13ee24a4e 100644
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -45,7 +45,7 @@ require_login($course->id, true);
 $PAGE->set_pagelayout('incourse');
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
-add_to_log($course->id, 'wiki', 'view all', "index.php?id=$course->id", "");
+add_to_log($course->id, 'wiki', 'view', "index.php?id=".$id, "");
 
 /// Get all required stringswiki
 $strwikis = get_string("modulenameplural", "wiki");
diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php
index 80aa4277faf..4467b171e96 100644
--- a/mod/wiki/instancecomments.php
+++ b/mod/wiki/instancecomments.php
@@ -94,12 +94,12 @@ if ($action == 'delete') {
 
     if ($action == 'edit') {
         $comm->set_action($action, $id, $content);
-
     } else {
         $action = 'add';
         $comm->set_action($action, 0, $content);
     }
 }
+add_to_log($course->id, 'wiki', 'comment', "comments.php?pageid=".$pageid, $pageid, $cm->id);
 
 $comm->print_header();
 $comm->print_content();
diff --git a/mod/wiki/lock.php b/mod/wiki/lock.php
index 562aabfcf01..d82a0f0db1b 100644
--- a/mod/wiki/lock.php
+++ b/mod/wiki/lock.php
@@ -71,8 +71,6 @@ require_login($course->id, false, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:editpage', $context);
 
-//add_to_log($course->id, "wiki", "lock", "lock.php?id=$cm->id", "$wiki->id");
-
 $wikipage = new page_wiki_lock($wiki, $subwiki, $cm);
 $wikipage->set_page($page);
 
diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index 341667bfcf6..edd49d1c8b8 100644
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -56,13 +56,11 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
 require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
-add_to_log($course->id, "wiki", "map", "map.php?id=$cm->id", "$wiki->id");
 
-/// Print page header
-
-/// Finish the page
 $wikipage = new page_wiki_map($wiki, $subwiki, $cm);
+add_to_log($course->id, "wiki", "map", "map.php?pageid=".$pageid, $pageid, $cm->id);
 
+// Print page header
 $wikipage->set_view($option);
 $wikipage->set_page($page);
 $wikipage->print_header();
diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php
index e4c516499d7..f725976f3de 100644
--- a/mod/wiki/overridelocks.php
+++ b/mod/wiki/overridelocks.php
@@ -67,8 +67,6 @@ require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:overridelock', $context);
 
-add_to_log($course->id, "wiki", "overridelocks", "overridelocks.php?id=$cm->id", "$wiki->id");
-
 if (!confirm_sesskey()) {
     print_error(get_string('invalidsesskey', 'wiki'));
 }
@@ -79,6 +77,7 @@ $wikipage->set_page($page);
 if (!empty($section)) {
     $wikipage->set_section($sectioncontent, $section);
 }
+add_to_log($course->id, "wiki", "overridelocks", "view.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index d14c92b498f..ecf3ff3efb8 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -935,11 +935,14 @@ class page_wiki_create extends page_wiki {
             $this->subwiki = wiki_get_subwiki($swid);
         }
         if ($data) {
+            $this->set_title($data->pagetitle);
             $id = wiki_create_page($this->subwiki->id, $data->pagetitle, $data->pageformat, $USER->id);
         } else {
+            $this->set_title($pagetitle);
             $id = wiki_create_page($this->subwiki->id, $pagetitle, $PAGE->activityrecord->defaultformat, $USER->id);
         }
-        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $id);
+        $this->page = $id;
+        return $id;
     }
 }
 
diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index 30a19ea1a3b..6556ed76488 100644
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -56,11 +56,10 @@ require_login($course->id, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
 
-add_to_log($course->id, "wiki", "view", "prettyview.php?pageid=$pageid", "$wiki->id");
-
 $wikipage = new page_wiki_prettyview($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
+add_to_log($course->id, "wiki", "view", "prettyview.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 $wikipage->print_content();
diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php
index a959b322565..eba4e2379f9 100644
--- a/mod/wiki/restoreversion.php
+++ b/mod/wiki/restoreversion.php
@@ -60,8 +60,6 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, "restore", "restore", "view.php?id=$cm->id", "$wiki->id");
-
 if ($confirm) {
     if (!confirm_sesskey()) {
         print_error(get_string('invalidsesskey', 'wiki'));
@@ -77,6 +75,7 @@ if ($confirm) {
     $wikipage->set_versionid($versionid);
 
 }
+add_to_log($course->id, "wiki", "restore", "view.php?pageid=".$pageid, $pageid, $cm->id);
 
 $wikipage->print_header();
 $wikipage->print_content();
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index c29bfeccada..85e81e8f500 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -269,8 +269,6 @@ require_login($course, true, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
 
-add_to_log($course->id, 'wiki', 'view', 'view.php?id=' . $cm->id, $wiki->id);
-
 // Update 'viewed' state if required by completion system
 require_once($CFG->libdir . '/completionlib.php');
 $completion = new completion_info($course);
@@ -294,6 +292,14 @@ if ($id) {
 $wikipage->set_gid($currentgroup);
 $wikipage->set_page($page);
 
+if($pageid) {
+    add_to_log($course->id, 'wiki', 'view', "view.php?pageid=".$pageid, $pageid, $cm->id);
+} else if($id) {
+    add_to_log($course->id, 'wiki', 'view', "view.php?id=".$id, $id, $cm->id);
+} else if($wid && $title) {
+    add_to_log($course->id, 'wiki', 'view', "view.php?wid=".$wid."&title=".$title, $wid, $cm->id);
+}
+
 $wikipage->print_header();
 $wikipage->print_content();
 
diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index ca420d24f5b..fb36789e173 100644
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -59,14 +59,15 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
 require_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "history", "history.php?id=$cm->id", "$wiki->id");
 
-/// Print the page header
 $wikipage = new page_wiki_viewversion($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 $wikipage->set_versionid($versionid);
 
+add_to_log($course->id, "wiki", "history", "viewversion.php?pageid=".$pageid."&versionid=".$versionid, $pageid, $cm->id);
+
+// Print the page header
 $wikipage->print_header();
 $wikipage->print_content();