       # if Form.isBulk()
       #   Form.setUpBulkFields()
 
-      if @data?.docPromise? then Q.when(@data.docPromise).then => Form.mergeLatestDoc(@)
+      if @data?.docPromise?
+        Q.when(@data.docPromise).then =>
+          Form.mergeLatestDoc(@)
+          Form.setUpAutosave(@)
+      else
+        Form.setUpAutosave(@)
       
       formArgs.onRender?.apply(@, arguments)
 

      template.formDoc = Form.getInputValues(template)

    Form.setUpAutosave = (template) ->
      # TODO(aramk) This is causing the form to submit and remove fields. Disabled for now.
      return

      return unless formArgs.autosave
      template = getTemplate(template)
      $form = Form.getElement(template)

          hasRequiredField = true

      Form.setUpFields(@)

      if hasRequiredField
        @$('.ui.form.segment').append($('<div class="footer"><div class="required"></div>Required field</div>'))
