diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 4622c22b4..bf1f43b96 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -211,6 +211,12 @@
 			<trans-unit id="validationerror_upload_error" resname="validationerror_upload_error">
 				<source>Upload failed, please check permissions on the server!</source>
 			</trans-unit>
+			<trans-unit id="validationerror_container_label" resname="validationerror_container_label">
+				<source>Problematic form fields</source>
+			</trans-unit>
+			<trans-unit id="validationerror_title" resname="validationerror_title">
+				<source>There are errors in this form</source>
+			</trans-unit>
 			<trans-unit id="validationerror_spam" resname="validationerror_spam">
 				<source>Spam recognized:</source>
 			</trans-unit>
diff --git a/Resources/Private/Partials/Misc/FormError.html b/Resources/Private/Partials/Misc/FormError.html
index 5140fb39b..bad47c50c 100644
--- a/Resources/Private/Partials/Misc/FormError.html
+++ b/Resources/Private/Partials/Misc/FormError.html
@@ -2,25 +2,45 @@
 
 <f:form.validationResults>
     <f:if condition="{validationResults.flattenedErrors}">
-        <ul class="powermail_message powermail_message_error">
-            <f:for each="{validationResults.flattenedErrors}" as="errors">
-                <f:for each="{errors}" as="singleError">
-                    <li>
-                        <f:if condition="{singleError.message} == 'spam_details'">
-                            <f:then>
-                                <f:translate key="validationerror_spam" /> {singleError.arguments.spamfactor}
-                            </f:then>
-                            <f:else>
-                                <f:if condition="{singleError.arguments.marker}">
-                                    <vh:getter.getFieldPropertyFromMarkerAndForm marker="{singleError.arguments.marker}" form="{form}" property="title"/>:
-                                </f:if>
-                            </f:else>
-                        </f:if>
+        <nav class="powermail_message powermail_message_error" aria-label="{f:translate(key: 'validationerror_container_label')}">
+            <h2><f:translate key="validationerror_title" /></h2>
 
-                        <f:translate key="validationerror_{singleError.message}">{singleError.message}</f:translate>
-                    </li>
+            <ol>
+                <f:for each="{validationResults.flattenedErrors}" as="errors">
+                    <f:for each="{errors}" as="singleError">
+                        <li>
+                            <f:if condition="{singleError.message} == 'spam_details'">
+                                <f:then>
+                                    <f:translate key="validationerror_spam" /> {singleError.arguments.spamfactor}
+
+                                    <f:translate key="validationerror_{singleError.message}">{singleError.message}</f:translate>
+                                </f:then>
+                                <f:else>
+                                    <f:if condition="{singleError.arguments.marker}">
+                                        <f:if condition="{vh:getter.getFieldPropertyFromMarkerAndForm(marker: singleError.arguments.marker, form: form, property: 'type')} == 'check'
+                                            || {vh:getter.getFieldPropertyFromMarkerAndForm(marker: singleError.arguments.marker, form: form, property: 'type')} == 'radio'">
+                                            <f:then>
+                                                <a href="#powermail_field_{singleError.arguments.marker}_1">
+                                                    <vh:getter.getFieldPropertyFromMarkerAndForm marker="{singleError.arguments.marker}" form="{form}" property="title"/>:
+
+                                                    <f:translate key="validationerror_{singleError.message}">{singleError.message}</f:translate>
+                                                </a>
+                                            </f:then>
+                                            <f:else>
+                                                <a href="#powermail_field_{singleError.arguments.marker}">
+                                                    <vh:getter.getFieldPropertyFromMarkerAndForm marker="{singleError.arguments.marker}" form="{form}" property="title"/>:
+
+                                                    <f:translate key="validationerror_{singleError.message}">{singleError.message}</f:translate>
+                                                </a>
+                                            </f:else>
+                                        </f:if>
+                                    </f:if>
+                                </f:else>
+                            </f:if>
+                        </li>
+                    </f:for>
                 </f:for>
-            </f:for>
-        </ul>
+            </ol>
+        </nav>
     </f:if>
 </f:form.validationResults>