diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index 6ba104de3131e1dd3cb4581ac973af317790c1f8..ac75783cfb66fdc03eb14d8f9e6fa47733e80c63 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -32,7 +32,6 @@ use SGalinski\SgJobs\Property\TypeConverter\UploadedFileReferenceConverter;
 use SGalinski\SgJobs\Service\FrontendFilterService;
 use SGalinski\SgMail\Service\MailTemplateService;
 use SJBR\StaticInfoTables\Domain\Repository\CountryRepository;
-use SJBR\StaticInfoTables\Utility\LocalizationUtility;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -111,7 +110,6 @@ class JoblistController extends ActionController {
 	 * @param string $error
 	 * @param string $folderName
 	 * @param int $uid
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
 	 */
 	public function applyFormAction(JobApplication $applyData = NULL, $error = NULL, $folderName = NULL, $uid = NULL) {
 		if ($error !== NULL && $error !== '') {
@@ -242,7 +240,7 @@ class JoblistController extends ActionController {
 			if ($originalResource) {
 				$this->addAttachmentsToMail($originalResource, $mailService);
 			}
-			
+
 			$mailService->sendEmail();
 
 			$redirectPageUid = (int) $this->settings['redirectPage'];
diff --git a/Resources/Private/Templates/Joblist/ApplyForm.html b/Resources/Private/Templates/Joblist/ApplyForm.html
index a92f9324ecf8ebfd92a9bc01def28fe3cc57e6d2..3a7eec18daa4886fd514ce6adf8e5bd17c49d7db 100644
--- a/Resources/Private/Templates/Joblist/ApplyForm.html
+++ b/Resources/Private/Templates/Joblist/ApplyForm.html
@@ -32,8 +32,8 @@
 
 		<f:if condition="{job}">
 			<p>
-				<input type="hidden" name="tx_sgjobs_jobapplication[applyData][jobId]" value="{job.jobId}" />
-				<input type="hidden" name="tx_sgjobs_jobapplication[applyData][jobTitle]" value="{job.title}" />
+				<f:form.hidden name="jobId" value="{job.jobId}" />
+				<f:form.hidden name="jobTitle" value="{job.title}" />
 				<label for="apply-title"><f:translate key="frontend.apply.title" /></label>
 				<span id="apply-title">{job.title}</span>
 			</p>