diff --git a/webform.module b/webform.module
index 8556542..6fce91b 100644
--- a/webform.module
+++ b/webform.module
@@ -1980,6 +1980,9 @@ function webform_node_view($node, $view_mode) {
       // then change the user ID for this submission.
       if($user->uid != 0 && $submission->uid != $user->uid) {
         $submission->uid = $user->uid;
+        // Save the submission now, so that the user ID is saved even if they
+        // don't press 'save as draft' again.
+        webform_submission_update($node, $submission);
       }
     }
   }
@@ -3364,7 +3367,7 @@ function webform_client_form_submit($form, &$form_state) {
       drupal_page_is_cacheable(FALSE);
     }
     elseif ($redirect_url == '<none>') {
-      // No redirect needed. Show a confirmatin message if there is one.
+      // No redirect needed. Show a confirmation message if there is one.
     }
     elseif ($redirect_url == '<confirmation>') {
       // No confirmation message needed because it will be shown on the