diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index bf5d5427a46..eef2f894570 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -1192,7 +1192,7 @@ class quiz_attempt {
      */
     public function render_question_at_step($slot, $seq, $reviewing, $thispageurl = '') {
         return $this->quba->render_question_at_step($slot, $seq,
-                $this->get_display_options($reviewing),
+                $this->get_display_options_with_edit_link($reviewing, $slot, $thispageurl),
                 $this->get_question_number($slot));
     }
 
diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php
index 9e79eeed27b..7359ff00426 100644
--- a/mod/quiz/reviewquestion.php
+++ b/mod/quiz/reviewquestion.php
@@ -35,7 +35,7 @@ $seq = optional_param('step', null, PARAM_INT);
 $baseurl = new moodle_url('/mod/quiz/reviewquestion.php',
         array('attempt' => $attemptid, 'slot' => $slot));
 $currenturl = new moodle_url($baseurl);
-if ($seq !== 0) {
+if (!is_null($seq)) {
     $currenturl->param('step', $seq);
 }
 $PAGE->set_url($currenturl);