diff --git a/user/editor.php b/user/editor.php
index 3abcc04b2d0..febb4c39a20 100644
--- a/user/editor.php
+++ b/user/editor.php
@@ -36,7 +36,7 @@ $PAGE->set_url('/user/editor.php', array('id' => $userid, 'course' => $courseid)
 list($user, $course) = useredit_setup_preference_page($userid, $courseid);
 
 // Create form.
-$editorform = new user_edit_editor_form(null, array('userid' => $user->id));
+$editorform = new user_edit_editor_form();
 
 $user->preference_htmleditor = get_user_preferences( 'htmleditor', '', $user->id);
 $editorform->set_data($user);
diff --git a/user/editor_form.php b/user/editor_form.php
index 248499c48b5..c1f5ba5c83c 100644
--- a/user/editor_form.php
+++ b/user/editor_form.php
@@ -45,6 +45,10 @@ class user_edit_editor_form extends moodleform {
         $mform = $this->_form;
 
         $editors = editors_get_enabled();
+
+        $mform->addElement('hidden', 'id');
+        $mform->setType('id', PARAM_INT);
+
         if (count($editors) > 1) {
             $choices = array('' => get_string('defaulteditor'));
             $firsteditor = '';