diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index 1afca647bc0..ed0b5cb7642 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -15,6 +15,7 @@ class assignment_online extends assignment_base {
         global $USER;
 
         $submission = $this->get_submission();
+        
         //Guest can not submit nor edit an assignment (bug: 4604)
         if (isguest($USER->id)) {
             $editable = null;
@@ -41,6 +42,7 @@ class assignment_online extends assignment_base {
         if ($data = data_submitted()) {      // No incoming data?
             if ($editable && $this->update_submission($data)) {
                 //TODO fix log actions - needs db upgrade
+                $submission = $this->get_submission();
                 add_to_log($this->course->id, 'assignment', 'upload', 
                         'view.php?a='.$this->assignment->id, $this->assignment->id, $this->cm->id);
                 $this->email_teachers($submission);
@@ -55,7 +57,6 @@ class assignment_online extends assignment_base {
         }
 
         print_simple_box_start('center', '70%', '', '', 'generalbox', 'online');
-        $submission = $this->get_submission();
         if ($editmode) {
             $this->view_edit_form($submission);
         } else {