diff --git a/templates/ktcore/document/add.smarty b/templates/ktcore/document/add.smarty
index 574f9de..73a7f93 100644
--- a/templates/ktcore/document/add.smarty
+++ b/templates/ktcore/document/add.smarty
@@ -60,7 +60,6 @@ addLoadEvent(startupMetadata);
 <form method="POST" action="{$smarty.server.PHP_SELF|addQueryString:"postExpected=1&fFolderId="}{$context->oFolder->getId()}" enctype="multipart/form-data">
 <fieldset><legend>{i18n}Add a document{/i18n}</legend>
 <input type="hidden" name="action" value="upload">
-<input type="hidden" name="postReceived" value="1">
 <input type="hidden" name="fFolderId" value="{$context->oFolder->getId()}">
 
 {foreach from=$add_fields item=oWidget }
@@ -78,6 +77,7 @@ addLoadEvent(startupMetadata);
 </div>
 
 <div class="form_actions">
-  <input type="submit" name="submit" value="{i18n}Add{/i18n}">
+  <input type="submit" name="submit" value="{i18n}Add{/i18n}" />
 </div>
+<input type="hidden" name="postReceived" value="1" />
 </form>
diff --git a/templates/ktcore/folder/bulkUpload.smarty b/templates/ktcore/folder/bulkUpload.smarty
index ebbe1f8..3ee7198 100644
--- a/templates/ktcore/folder/bulkUpload.smarty
+++ b/templates/ktcore/folder/bulkUpload.smarty
@@ -44,7 +44,7 @@ addLoadEvent(startupMetadata);
 {/capture}
 {$context->oPage->requireJSStandalone($sJavascript)}
 
-<form method="POST" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data">
+<form method="POST" action="{$smarty.server.PHP_SELF|addQueryString:"postExpected=1&fFolderId="}{$context->oFolder->getId()}" enctype="multipart/form-data">
 <fieldset><legend>{i18n}Bulk import{/i18n}</legend>
 <p class="descriptiveText">{i18n}The bulk upload facility allows for a number
 of documents to be added to the document management system.
@@ -72,4 +72,5 @@ management system.{/i18n}</p>
 <div class="form_actions">
   <input type="submit" name="submit" value="{i18n}Upload{/i18n}" />
 </div>
+<input type="hidden" name="postReceived" value="1" />
 </form>