diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 89884463b8a..15a940b66e9 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -932,5 +932,27 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2015111601, 'quiz');
     }
 
+    if ($oldversion < 2015111602) {
+        // Find quizzes with the combination of require passing grade and grade to pass 0.
+        $quizzes = $DB->get_records_sql("
+            SELECT gi.id, gi.iteminstance
+		      FROM {quiz} q
+        INNER JOIN {course_modules} cm ON q.id = cm.instance
+        INNER JOIN {grade_items} gi ON q.id = gi.iteminstance
+		     WHERE q.completionpass = 1
+               AND gi.gradepass = 0
+               AND cm.completiongradeitemnumber IS NULL");
+        if ($quizzes) {
+            foreach ($quizzes as $quiz) {
+                $DB->execute("UPDATE {course_modules}
+                                 SET completiongradeitemnumber = :gradeitemid
+                               WHERE instance = :quizid",
+                    array('gradeitemid' => $quiz->id, 'quizid' => $quiz->iteminstance));
+            }
+        }
+        // Quiz savepoint reached.
+        upgrade_mod_savepoint(true, 2015111602, 'quiz');
+    }
+
     return true;
 }
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index bf8cf68f543..cc5d57eb275 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -399,6 +399,7 @@ $string['grademethod_help'] = 'When multiple attempts are allowed, the following
 * Last attempt (all other attempts are ignored)';
 $string['gradesdeleted'] = 'Quiz grades deleted';
 $string['gradesofar'] = '{$a->method}: {$a->mygrade} / {$a->quizgrade}.';
+$string['gradetopassnotset'] = 'This quiz does not have a grade to pass set so you cannot use this option. Please use the require grade setting instead.';
 $string['gradingdetails'] = 'Marks for this submission: {$a->raw}/{$a->max}.';
 $string['gradingdetailsadjustment'] = 'With previous penalties this gives <strong>{$a->cur}/{$a->max}</strong>.';
 $string['gradingdetailspenalty'] = 'This submission attracted a penalty of {$a}.';
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index a768e975149..d2938baf8f8 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -533,6 +533,13 @@ class mod_quiz_mod_form extends moodleform_mod {
             }
         }
 
+        if (array_key_exists('completion', $data) && $data['completion'] == COMPLETION_TRACKING_AUTOMATIC) {
+            // Show an error if require passing grade was selected and the grade to pass was setted to 0.
+            if ($data['completionpass'] == 1 && (empty($data['gradepass']) || grade_floatval($data['gradepass']) == 0)) {
+                $errors['gradepass'] = get_string('gradetopassnotset', 'quiz');
+            }
+        }
+
         // Check the boundary value is a number or a percentage, and in range.
         $i = 0;
         while (!empty($data['feedbackboundaries'][$i] )) {
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index 6e4f8e8e6cd..70a0e4b90c2 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015111601;
+$plugin->version   = 2015111602;
 $plugin->requires  = 2015111000;
 $plugin->component = 'mod_quiz';
 $plugin->cron      = 60;