diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index 3db557799cf6af7783c1bf1c75f23f261afc44c3..f8920035443f5517385df0ccb3f2663887407917 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -231,6 +231,7 @@ class JoblistController extends ActionController {
 	 * @param JobApplication $applyData
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentNameException
 	 */
 	public function applyAction(JobApplication $applyData) {
 		try {
@@ -307,7 +308,13 @@ class JoblistController extends ActionController {
 			$this->redirect('applyForm');
 
 		} catch (\Exception $exception) {
-			$this->forward('applyForm', NULL, NULL, ['applyData' => $applyData, 'error' => $exception->getMessage()]);
+			$job = $applyData->getJob();
+			$jobId = $job !== NULL ? $job->getUid() : NULL;
+			$this->request->setArgument('folderName', $folderName);
+			$this->forward(
+				'applyForm', NULL, NULL,
+				['applyData' => $applyData, 'error' => $exception->getMessage(), 'uid' => $jobId]
+			);
 		}
 	}