diff --git a/mod/lesson/pagetypes/matching.php b/mod/lesson/pagetypes/matching.php
index 3bcdf978881..eff2d50258d 100644
--- a/mod/lesson/pagetypes/matching.php
+++ b/mod/lesson/pagetypes/matching.php
@@ -383,26 +383,23 @@ class lesson_page_type_matching extends lesson_page {
                 } else {
                     $answerdata->response = $answer->response;
                 }
+                if ($this->lesson->custom) {
+                        $answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
+                    } else {
+                        $answerdata->score = get_string("receivedcredit", "lesson");
+                    }
             } elseif ($n == 1 && $useranswer != NULL && !$useranswer->correct) {
                 if ($answer->response == NULL && $useranswer != NULL) {
                     $answerdata->response = get_string("thatsthewronganswer", "lesson");
                 } else {
                     $answerdata->response = $answer->response;
                 }
-            } elseif ($n > 1) {
-                if ($n == 2 && $useranswer != NULL && $useranswer->correct) {
-                    if ($this->lesson->custom) {
-                        $answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
-                    } else {
-                        $answerdata->score = get_string("receivedcredit", "lesson");
-                    }
-                } elseif ($n == 3 && $useranswer != NULL && !$useranswer->correct) {
-                    if ($this->lesson->custom) {
-                        $answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
-                    } else {
-                        $answerdata->score = get_string("didnotreceivecredit", "lesson");
-                    }
+                if ($this->lesson->custom) {
+                    $answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
+                } else {
+                    $answerdata->score = get_string("didnotreceivecredit", "lesson");
                 }
+            } elseif ($n > 1) {
                 $data = "<select disabled=\"disabled\"><option selected=\"selected\">".strip_tags(format_string($answer->answer))."</option></select>";
                 if ($useranswer != NULL) {
                     $userresponse = explode(",", $useranswer->useranswer);
@@ -427,7 +424,7 @@ class lesson_page_type_matching extends lesson_page {
                         $percent = get_string("nooneansweredthisquestion", "lesson");
                     }
                 } else {
-                    $percent = "";
+                    $percent = '';
                 }
 
                 $answerdata->answers[] = array($data, $percent);
diff --git a/mod/lesson/pagetypes/shortanswer.php b/mod/lesson/pagetypes/shortanswer.php
index 8681fdf73cc..a8a64a6db9c 100644
--- a/mod/lesson/pagetypes/shortanswer.php
+++ b/mod/lesson/pagetypes/shortanswer.php
@@ -260,7 +260,7 @@ class lesson_page_type_shortanswer extends lesson_page {
                     $answerdata->answers[] = array(get_string("nooneansweredthisquestion", "lesson"), " ");
                 }
                 $i++;
-            } else if ($useranswer != null && ($answer->id == $useranswer->answerid || ($answer == end($answers) && empty($answerdata)))) {
+            } else if ($useranswer != null && ($answer->id == $useranswer->answerid || $answer == end($answers))) {
                  // get in here when what the user entered is not one of the answers
                 $data = '<input type="text" size="50" disabled="disabled" readonly="readonly" value="'.s($useranswer->useranswer).'">';
                 if (isset($pagestats[$this->properties->id][$useranswer->useranswer])) {