diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index d0b13f51281..53d74200473 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1603,8 +1603,9 @@ class grade_report_grader extends grade_report {
         }
 
         $name = shorten_text($element['object']->get_name());
-        $courseheader = html_writer::tag('span', $name, array('id' => 'courseheader'));
-        $courseheader .= html_writer::label($showing, 'courseheader', false, array('class' => 'accesshide'));
+        $courseheaderid = 'courseheader_' . clean_param($name, PARAM_ALPHANUMEXT);
+        $courseheader = html_writer::tag('span', $name, array('id' => $courseheaderid));
+        $courseheader .= html_writer::label($showing, $courseheaderid, false, array('class' => 'accesshide'));
         $courseheader .= $icon;
 
         return $courseheader;
diff --git a/user/addnote.php b/user/addnote.php
index 4072718bb2f..d4f764be86e 100644
--- a/user/addnote.php
+++ b/user/addnote.php
@@ -103,9 +103,9 @@ foreach ($users as $k => $v) {
     if (!$user = $DB->get_record('user', array('id' => $v))) {
         continue;
     }
-    $checkbox = html_writer::label(get_string('selectnotestate', 'notes'), 'menustates', false, array('class' => 'accesshide'));
+    $checkbox = html_writer::label(get_string('selectnotestate', 'notes'), 'menustates_'.$v, false, array('class' => 'accesshide'));
     $checkbox .= html_writer::select($statenames, 'states[' . $k . ']',
-        empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false, array('id' => 'menustates'));
+        empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false, array('id' => 'menustates_'.$v));
     $table->data[] = array(
         '<input type="hidden" name="userid['.$k.']" value="'.$v.'" />'. fullname($user, true),
         '<textarea name="contents['. $k . ']" rows="2" cols="40" spellcheck="true">' . strip_tags(@$contents[$k]) . '</textarea>',