diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 0e0123a5827..c972e523b93 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -873,12 +873,12 @@ function quiz_send_notification_emails($course, $quiz, $attempt, $context, $cm)
         $a->courseshortname = $course->shortname;
         // quiz info
         $a->quizname = $quiz->name;
-        $a->quizreportlink = '<a href="report.php?q=' . $quiz->id . '">' . format_string($quiz->name) . ' report</a>';
         $a->quizreporturl = $CFG->wwwroot . '/mod/quiz/report.php?q=' . $quiz->id;
-        $a->quizreviewlink = '<a href="review.php?attempt=' . $attempt->id . '">' . format_string($quiz->name) . ' review</a>';
+        $a->quizreportlink = '<a href="' . $a->quizreporturl . '">' . format_string($quiz->name) . ' report</a>';
         $a->quizreviewurl = $CFG->wwwroot . '/mod/quiz/review.php?attempt=' . $attempt->id;
-        $a->quizlink = '<a href="view.php?q=' . $quiz->id . '">' . format_string($quiz->name) . '</a>';
+        $a->quizreviewlink = '<a href="' . $a->quizreviewurl . '">' . format_string($quiz->name) . ' review</a>';
         $a->quizurl = $CFG->wwwroot . '/mod/quiz/view.php?q=' . $quiz->id;
+        $a->quizlink = '<a href="' . $a->quizurl . '">' . format_string($quiz->name) . '</a>';
         // attempt info
         $a->submissiontime = userdate($attempt->timefinish);
         $a->timetaken = format_time($attempt->timefinish - $attempt->timestart);