diff --git a/annotate.php b/annotate.php
index d92c4eb..245cf2a 100644
--- a/annotate.php
+++ b/annotate.php
@@ -129,7 +129,7 @@
             $dataobject = new stdClass();
             $dataobject->id = $key;
             $dataobject->pageid = $pageversion->pageid;
-            $dataobject->userid = $userid;
+            $dataobject->userid = $USER->id;
             $dataobject->timemodified = time();
             $dataobject->content = $value;
             $DB->update_record('ouwiki_annotations', $dataobject);
@@ -146,7 +146,7 @@
         if ($value != '') {
             $dataobject = new stdClass();
             $dataobject->pageid = $pageversion->pageid;
-            $dataobject->userid = $userid;
+            $dataobject->userid = $USER->id;
             $dataobject->timemodified = time();
             $dataobject->content = $value;
             $newannoid = $DB->insert_record('ouwiki_annotations', $dataobject);
diff --git a/edit.php b/edit.php
index ac2c6c2..345d69c 100644
--- a/edit.php
+++ b/edit.php
@@ -418,6 +418,7 @@
 $data->frompage = $frompage;
 $data->newsection = $newsection;
 $data->section = $section;
+$data->user = $subwiki->userid;
 
 // Prepare form file manager attachments
 if ($useattachments) {
diff --git a/edit_form.php b/edit_form.php
index 79e6f3c..8c6f191 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -41,6 +41,8 @@ protected function definition() {
         $mform->setType('id', PARAM_INT);
         $mform->addElement('hidden', 'startversionid', null);
         $mform->setType('startversionid', PARAM_INT);
+        $mform->addElement('hidden', 'user', null);
+        $mform->setType('user', PARAM_INT);
         if (!$this->_customdata->startpage) {
             $mform->addElement('hidden', 'page', '');
             $mform->setType('page', PARAM_TEXT);
diff --git a/locallib.php b/locallib.php
index ecb146c..db6b429 100644
--- a/locallib.php
+++ b/locallib.php
@@ -2166,6 +2166,7 @@ function ouwiki_display_create_page_form($subwiki, $cm, $pageversion) {
     if ($pageversion->title !== '') {
         $result .= '<input type="hidden" name="page" value="' . $pageversion->title . '" />';
     }
+    $result .= '<input type="hidden" name="user" value="' . $subwiki->userid . '" />';
     $result .= get_string('addnewsection', 'ouwiki') . ' ' .
             '<input type="text" size="30" name="newsection" id="ouw_newsectionname" value="" />' .
             '<input type="submit" id="ouw_add" name="ouw_subb" value="' .