diff --git a/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html b/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
index 0e1bd44428399d3b8e676852cc712104673011ff..c96a9686ac9b390f3695fa72a5bb317f1d81f372 100644
--- a/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
+++ b/Resources/Private/Templates/Bootstrap5/Joblist/ApplyForm.html
@@ -274,32 +274,27 @@
                         <div class="col">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'firstName', field-text: 'first_name', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'firstName'}" />
                         </div>
 
                         <div class="col">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'lastName', field-text: 'last_name', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'lastName'}" />
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-6">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'street', field-text: 'street', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'street'}" />
                         </div>
 
                         <div class="col-4">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'city', field-text: 'city', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'city'}" />
                         </div>
 
                         <div class="col-2">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'zip', field-text: 'zip', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'zip'}" />
                         </div>
                     </div>
                     <div class="row">
@@ -322,7 +317,6 @@
                         <div class="col">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'education', field-text: 'education', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'education'}" />
                         </div>
 
                         <div class="col">
@@ -337,12 +331,10 @@
                         <div class="col">
                             <f:render section="formTextField"
                                 arguments="{field-id: 'phone', field-text: 'phone', required: 'required'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'phone'}" />
                         </div>
 
                         <div class="col">
                             <f:render section="formTextField" arguments="{field-id: 'mobile', field-text: 'mobile'}" />
-                            <f:render section="formValidation" arguments="{form-field: 'mobile'}" />
                         </div>
                     </div>
                     <div class="row">
@@ -397,7 +389,7 @@
                     </div>
                     <div class="col-xs-12">
                         <div class="form-group jobs-upload-group">
-                            <label for="apply-cv" class="smart-label filled">
+                            <label for="apply-cv" class="form-label filled">
                                 <f:translate key="frontend.apply.cv" />
                                 (
                                 <f:translate key="frontend.apply.allowed_file_extensions" />
@@ -444,7 +436,7 @@
 
                     <div class="col-xs-12">
                         <div class="form-group jobs-upload-group">
-                            <label for="apply-certificate" class="smart-label filled">
+                            <label for="apply-certificate" class="form-label filled">
                                 <f:translate key="frontend.apply.certificate" />
                                 (
                                 <f:translate key="frontend.apply.allowed_file_extensions" />
@@ -491,7 +483,7 @@
 
                     <div class="col-xs-12">
                         <div class="form-group">
-                            <label for="apply-message" class="smart-label">
+                            <label for="apply-message" class="form-label">
                                 <f:translate key="frontend.apply.message" />
                             </label>
                             <f:form.textarea class="form-control" rows="10" property="message" id="apply-message"
@@ -611,14 +603,15 @@
     </label>
     <f:form.textfield property="{field-id}" id="apply-{field-id}" class="form-control"
         placeholder="{f:translate(key:'frontend.apply.{field-text}')}" required="{required}" />
+    <f:render section="formValidation" arguments="{form-field: '{field-id}'}" />
 </f:section>
 
 <f:section name="formValidation">
     <f:form.validationResults for="applyData.{form-field}">
-            <ul class="text-danger pt-2">
-                <f:for each="{validationResults.errors}" as="error">
-                    <li>{error.message}</li>
-                </f:for>
-            </ul>
+        <ul class="text-danger pt-2">
+            <f:for each="{validationResults.errors}" as="error">
+                <li>{error.message}</li>
+            </f:for>
+        </ul>
     </f:form.validationResults>
 </f:section>
\ No newline at end of file