diff --git a/grade/edit/outcome/import_outcomes_form.php b/grade/edit/outcome/import_outcomes_form.php
index 71c672d8f89..f6077c832db 100644
--- a/grade/edit/outcome/import_outcomes_form.php
+++ b/grade/edit/outcome/import_outcomes_form.php
@@ -42,7 +42,7 @@ class import_outcomes_form extends moodleform {
 
         $mform->addElement('filepicker', 'userfile', get_string('importoutcomes', 'grades'));
         $mform->addRule('userfile', get_string('required'), 'required', null, 'server');
-        $mform->setHelpButton('userfile', array('importoutcomes', get_string('importoutcomes', 'grades'), 'grade'));
+        $mform->addHelpButton('userfile', 'importoutcomes', 'grades');
 
         $mform->addElement('submit', 'save', get_string('uploadthisfile'));
 
diff --git a/grade/edit/scale/edit_form.php b/grade/edit/scale/edit_form.php
index 362655eaf44..e727bffa91a 100644
--- a/grade/edit/scale/edit_form.php
+++ b/grade/edit/scale/edit_form.php
@@ -39,7 +39,7 @@ class edit_scale_form extends moodleform {
         $mform->addElement('static', 'used', get_string('used'));
 
         $mform->addElement('textarea', 'scale', get_string('scale'), array('cols'=>50, 'rows'=>2));
-        $mform->setHelpButton('scale', array('scales', get_string('scale')));
+        $mform->addHelpButton('scale', 'scale');
         $mform->addRule('scale', get_string('required'), 'required', null, 'client');
         $mform->setType('scale', PARAM_TEXT);
 
diff --git a/grade/edit/tree/outcomeitem_form.php b/grade/edit/tree/outcomeitem_form.php
index 64aaa87b14b..4cd5a716713 100644
--- a/grade/edit/tree/outcomeitem_form.php
+++ b/grade/edit/tree/outcomeitem_form.php
@@ -121,7 +121,7 @@ class edit_outcomeitem_form extends moodleform {
             } else {
                 $mform->addElement('text', 'aggregationcoef', get_string($coefstring, 'grades'));
             }
-            $mform->setHelpButton('aggregationcoef', array($coefstring, get_string($coefstring, 'grades'), 'grade'), true);
+            $mform->addHelpButton('aggregationcoef', $coefstring, 'grades');
         }
 
 /// hidden params
@@ -206,7 +206,7 @@ class edit_outcomeitem_form extends moodleform {
 
                     if ($aggcoef !== '') {
                         $agg_el->setLabel(get_string($aggcoef, 'grades'));
-                        $mform->setHelpButton('aggregationcoef', array($aggcoef, get_string($aggcoef, 'grades'), 'grade'));
+                        $mform->addHelpButton('aggregationcoef', $aggcoef, 'grades');
                     }
                 }
             }