diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 04821682c7a..6ff2c8fbf21 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -654,8 +654,10 @@ abstract class moodleform_mod extends moodleform {
             }
 
             if ($this->_features->gradecat) {
-                $categories = grade_get_categories_menu($COURSE->id, $this->_outcomesused);
-                $mform->addElement('select', 'gradecat', get_string('gradecategory', 'grades'), $categories);
+                $mform->addElement('select', 'gradecat',
+                        get_string('gradecategoryonmodform', 'grades'),
+                        grade_get_categories_menu($COURSE->id, $this->_outcomesused));
+                $mform->addHelpButton('gradecat', 'gradecategoryonmodform', 'grades');
             }
         }
     }
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 0e82b8929cf..94d132ccd56 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -219,7 +219,8 @@ $string['gradeboundary'] = 'Letter grade boundary';
 $string['gradeboundary_help'] = 'This setting determines the minimum percentage over which grades will be assigned the grade letter.';
 $string['gradecategories'] = 'Grade categories';
 $string['gradecategory'] = 'Grade category';
-$string['gradecategoryhelp'] = 'Grade category help';
+$string['gradecategoryonmodform'] = 'Grade category';
+$string['gradecategoryonmodform_help'] =  'This setting controls the category in which this activity\'s grades are placed in the gradebook.';
 $string['gradecategorysettings'] = 'Grade category settings';
 $string['gradedisplay'] = 'Grade display';
 $string['gradedisplaytype'] = 'Grade display type';
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index be6b2b64971..bb900ca6668 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -1622,7 +1622,7 @@ function quiz_supports($feature) {
         case FEATURE_MOD_INTRO:               return true;
         case FEATURE_COMPLETION_TRACKS_VIEWS: return true;
         case FEATURE_GRADE_HAS_GRADE:         return true;
-        case FEATURE_GRADE_OUTCOMES:          return true;
+        case FEATURE_GRADE_OUTCOMES:          return false;
         case FEATURE_BACKUP_MOODLE2:          return true;
 
         default: return null;
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 0da3ec6db03..84316c58f5e 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -86,6 +86,14 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->setDefault('grademethod', $quizconfig->grademethod);
         $mform->disabledIf('grademethod', 'attempts', 'eq', 1);
 
+//-------------------------------------------------------------------------------
+        // Grade settings
+        $this->standard_grading_coursemodule_elements();
+
+        $mform->removeElement('grade');
+        $mform->addElement('hidden', 'grade', $quizconfig->maximumgrade);
+        $mform->setType('grade', PARAM_NUMBER);
+
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'layouthdr', get_string('layout', 'quiz'));
 
@@ -281,8 +289,6 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->addElement('header', 'overallfeedbackhdr', get_string('overallfeedback', 'quiz'));
         $mform->addHelpButton('overallfeedbackhdr', 'overallfeedback', 'quiz');
 
-        $mform->addElement('hidden', 'grade', $quizconfig->maximumgrade);
-        $mform->setType('grade', PARAM_RAW);
         if (empty($this->_cm)) {
             $needwarning = $quizconfig->maximumgrade == 0;
         } else {