diff --git a/grade/edit/grade.php b/grade/edit/grade.php
index 6aabe082bcf..cc3d7f7ffd6 100644
--- a/grade/edit/grade.php
+++ b/grade/edit/grade.php
@@ -52,13 +52,16 @@ if ($mform->is_cancelled()) {
     redirect($returnurl);
 // form processing
 } else if ($data = $mform->get_data()) {
-
     $grade_grades = new grade_grades(array('id'=>$id));
     $grade_item = new grade_item(array('id'=>$grade_grades->itemid));
     $grade_item->update_final_grade($grade_grades->userid, $data->finalgrade, NULL, NULL, $data->feedback, $data->feedbackformat);
 
+    // Assign finalgrade value
+    $grade_grades->finalgrade = $data->finalgrade;
+
     // set locked
     $grade_grades->set_locked($data->locked);
+
     // set hidden
     $grade_grades->set_hidden($data->hidden);
 
diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 0208691ab09..c452ea03a39 100644
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -91,6 +91,7 @@ $string['feedbackadd'] = 'Add feedback';
 $string['feedbackedit'] = 'Edit feedback';
 $string['feedbackview'] = 'View feedback';
 $string['feedbacksaved'] = 'Feedback saved';
+$string['finalgrade'] = 'Final grade';
 $string['forelementtypes'] = ' for the selected $a';
 $string['forstudents'] = 'For Students';
 $string['full'] = 'Full';
@@ -116,6 +117,7 @@ $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br
 $string['grademax'] = 'Maximum grade';
 $string['grademin'] = 'Minimum grade';
 $string['gradepass'] = 'Grade to pass';
+$string['hidden'] = 'Hidden';
 $string['importplugins'] = 'Import plugins';
 $string['itemsedit'] = 'Edit grade item';
 $string['multfactor'] = 'Multiplicator';
@@ -126,6 +128,7 @@ $string['grades'] = 'Grades';
 $string['gradereports'] = 'Grades report';
 $string['graderreport'] = 'Grader report';
 $string['gradetype'] = 'Grade type';
+$string['gradeview'] = 'View Grade';
 $string['gradeweighthelp'] = 'Grade Weight Help';
 $string['hideadvanced'] = 'Hide Advanced Features';
 $string['hidecalculations'] = 'Hide calculations';