diff --git a/message/edit.php b/message/edit.php
index 17e0e75b222fa..a231b25553bd3 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -31,12 +31,9 @@
 $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications
 
 $url = new moodle_url('/message/edit.php');
-if ($userid !== $USER->id) {
-    $url->param('id', $userid);
-}
-if ($course != SITEID) {
-    $url->param('course', $course);
-}
+$url->param('id', $userid);
+$url->param('course', $course);
+
 $PAGE->set_url($url);
 
 if (!$course = $DB->get_record('course', array('id' => $course))) {