diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index c9484b785ea..7120d32d4d2 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -7,6 +7,7 @@
     require_once("lib.php");
 
     require_variable($id);    // Course Module ID
+    optional_variable($pageid);    // Lesson Page ID
 
     if (! $cm = get_record("course_modules", "id", $id)) {
         error("Course Module ID was incorrect");
@@ -59,7 +60,7 @@
         // display individual pages and their sets of answers
         // if pageid is EOL then the end of the lesson has been reached
         print_heading($lesson->name);
-		if (empty($_POST['pageid'])) {
+	if (empty($pageid)) {
             add_to_log($course->id, "lesson", "start", "view.php?id=$cm->id", "$lesson->id", $cm->id);
             // if no pageid given see if the lesson has been started
             if ($grades = get_records_select("lesson_grades", "lessonid = $lesson->id AND userid = $USER->id",
@@ -125,11 +126,9 @@
                 }
             }
             // start at the first page
-			if (!$pageid = get_field("lesson_pages", "id", "lessonid", $lesson->id, "prevpageid", 0)) {
+            if (!$pageid = get_field("lesson_pages", "id", "lessonid", $lesson->id, "prevpageid", 0)) {
                 error("Navigation: first page not found");
             }
-		} else {
-            $pageid = $_POST['pageid'];
         }
         if ($pageid != EOL) {
             add_to_log($course->id, "lesson", "view", "view.php?id=$cm->id&action=navigation&pageid=$pageid", "$pageid", $cm->id);