diff --git a/mod/data/lib.php b/mod/data/lib.php
index 2437ff37dc5..bb1e8f26dc7 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -962,7 +962,15 @@ function data_user_outline($course, $user, $mod, $data) {
     } else if ($grade) {
         $result = new stdClass();
         $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-        $result->time = $grade->dategraded;
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
+
         return $result;
     }
     return NULL;
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 9599e72e452..189fc6f6935 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1131,7 +1131,15 @@ function forum_user_outline($course, $user, $mod, $forum) {
     } else if ($grade) {
         $result = new stdClass();
         $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-        $result->time = $grade->dategraded;
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
+
         return $result;
     }
     return NULL;
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index ec5a023857f..5dafc63e89e 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -243,7 +243,15 @@ function glossary_user_outline($course, $user, $mod, $glossary) {
     } else if ($grade) {
         $result = new stdClass();
         $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-        $result->time = $grade->dategraded;
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
+
         return $result;
     }
     return NULL;
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 813ff4c4381..74954f1ec49 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -166,8 +166,14 @@ function lesson_user_outline($course, $user, $mod, $lesson) {
     } else {
         $grade = reset($grades->items[0]->grades);
         $return->info = get_string("grade") . ': ' . $grade->str_long_grade;
-        $return->time = $grade->dategraded;
-        $return->info = get_string("no")." ".get_string("attempts", "lesson");
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
     }
     return $return;
 }
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index ac8e09b90f9..f48d1aba880 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -381,7 +381,15 @@ function quiz_user_outline($course, $user, $mod, $quiz) {
 
     $result = new stdClass;
     $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-    $result->time = $grade->dategraded;
+
+    //datesubmitted == time created. dategraded == time modified or time overridden
+    //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+    if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+        $result->time = $grade->dategraded;
+    } else {
+        $result->time = $grade->datesubmitted;
+    }
+
     return $result;
 }
 
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 88ecd280917..1d42ed6934c 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -294,7 +294,15 @@ function scorm_user_outline($course, $user, $mod, $scorm) {
         $grade = reset($grades->items[0]->grades);
         $result = new stdClass();
         $result->info = get_string('grade') . ': '. $grade->str_long_grade;
-        $result->time = $grade->dategraded;
+
+        //datesubmitted == time created. dategraded == time modified or time overridden
+        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+        if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+            $result->time = $grade->dategraded;
+        } else {
+            $result->time = $grade->datesubmitted;
+        }
+
         return $result;
     }
     return null;