diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index f6ad4e66500..516bfb7e6e7 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -505,7 +505,7 @@ class assignment_base {
             echo 'opener.document.getElementById("button'.$submission->userid.'").value="'.get_string('update').' ...";';
         }
         echo "\n-->\n</script>";
-        fflush();
+        flush();
     }
 
     /*
@@ -1304,11 +1304,14 @@ function assignment_grades($assignmentid) {
     if (!$assignment = get_record("assignment", "id", $assignmentid)) {
         return NULL;
     }
+    if ($assignment->grade == 0) { // No grading
+        return NULL;
+    }
 
     $grades = get_records_menu("assignment_submissions", "assignment",
                                $assignment->id, "", "userid,grade");
 
-    if ($assignment->grade >= 0) {
+    if ($assignment->grade > 0) {
         $return->grades = $grades;
         $return->maxgrade = $assignment->grade;
 
diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index 043c3e2a98b..c39fa7b471e 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -25,15 +25,9 @@
     if (!isset($form->preventlate)) {
         $form->preventlate = 0;
     }
-    if (!isset($form->grade)) {
-        $form->grade = 100;
-    }
     if (empty($form->maxbytes)) {
         $form->maxbytes = $CFG->assignment_maxbytes;
     }
-    if (empty($form->timedue)) {
-        $form->timedue = "";
-    }
 
 ?>
 <script type="text/javascript" language="javascript">