diff --git a/message/edit.php b/message/edit.php
index 8a498629229..7b73ec2686d 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -25,9 +25,13 @@
 require_once(dirname(__FILE__) . '/../config.php');
 require_once($CFG->dirroot . '/message/lib.php');
 
-$userid = optional_param('id', $USER->id, PARAM_INT);    // user id
+$userid = optional_param('id', 0, PARAM_INT);    // User id.
 $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications
 
+if (!$userid) {
+    $userid = $USER->id;
+}
+
 $url = new moodle_url('/message/edit.php');
 $url->param('id', $userid);