diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
index d417e0b8..f123309a 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html
@@ -58,7 +58,7 @@
             inline-template>
             <f:form id="configuratorform" object="{inquiry}" name="inquiry" action="processConfiguratorForm"
                     controller="AjaxForm" pluginName="Ajax" pageType="1703" pageUid="{settings.ajaxPageUid}"
-                    noCacheHash="1">
+                    noCacheHash="1" additionalAttributes="{'@submit.prevent': 'submitForm()'}">
                     <f:form.hidden property="travelType" additionalAttributes="{v-model: 'formData.type'}"/>
                     <f:form.hidden property="hotelType" additionalAttributes="{v-model: 'formData.accommodation'}"/>
                     <f:form.hidden property="locationType" additionalAttributes="{v-model: 'formData.destination'}"/>
@@ -253,8 +253,7 @@
                                 </span>
                             </div>
                             <div class="form__item form__item--button form__item--desktop">
-                                <button class="button button--configurator"
-                                        v-on:click.prevent="submitForm">&raquo; jetzt anfragen</button>
+                                <button class="button button--configurator">&raquo; jetzt anfragen</button>
                             </div>
                         </div>
                     </div>
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
index 5af36cce..5f256b09 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html
@@ -12,7 +12,8 @@
                     <div class="form">
                         <f:form id="inquiryform" object="{inquiry}" name="inquiry" action="processInquiryForm"
                                 controller="AjaxForm" pluginName="Ajax" pageType="1703"
-                                pageUid="{settings.ajaxPageUid}" noCacheHash="1">
+                                pageUid="{settings.ajaxPageUid}" noCacheHash="1"
+                                additionalAttributes="{'@submit.prevent': 'submitForm()'}">
                             <div class="form__item form__item--radios">
                                 <div class="form__field form__field--radio">
                                     <div class="form__item__inner">
@@ -95,7 +96,7 @@
                                                                                    target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.</span>
                             </div>
                             <div class="form__item form__item--button">
-                                <button type="submit" class="form__button" v-on:click.prevent="submitForm()">&raquo; Jetzt anfragen</button>
+                                <button type="submit" class="form__button">&raquo; Jetzt anfragen</button>
                             </div>
                         </f:form>
                         <div class="form__overlay" v-show="processing">
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
index 0732c97e..e997806a 100644
--- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
+++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html
@@ -13,7 +13,8 @@
                     <div class="form form--box">
                         <f:form id="inquiryform" object="{inquiry}" name="inquiry" action="processInquiryForm"
                                 controller="AjaxForm" pluginName="Ajax" pageType="1703"
-                                pageUid="{settings.ajaxPageUid}" noCacheHash="1">
+                                pageUid="{settings.ajaxPageUid}" noCacheHash="1"
+                                additionalAttributes="{'@submit.prevent': 'submitForm()'}">
                             <f:form.hidden property="travelType"/>
                             <f:form.hidden property="inquiryName"/>
                             <f:form.hidden property="pageUrl"/>
@@ -83,7 +84,7 @@
                                                                                    target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.</span>
                             </div>
                             <div class="form__item form__item--button">
-                                <button type="submit" class="form__button" v-on:click.prevent="submitForm()">&raquo; Jetzt anfragen</button>
+                                <button type="submit" class="form__button">&raquo; Jetzt anfragen</button>
                             </div>
                         </f:form>
                         <div class="form__overlay" v-show="processing">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html
index 71253dd1..0c39f61c 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html
@@ -9,7 +9,7 @@
                 <div class="form form--border">
                     <f:form id="contactform" object="{contactForm}" name="contactForm"
                             action="processForm" controller="AjaxForm" pluginName="Ajax" pageType="1803"
-                            noCacheHash="1" class="border" additionalAttributes="{v-show: '!success'}">
+                            noCacheHash="1" class="border" additionalAttributes="{'v-show': '!success', '@submit.prevent': 'submitForm()'}">
                         <f:form.hidden property="pageUrl"/>
                         <div class="form-group" :class="{ 'has-error': formErrors.name }">
                             <label for="name" class="control-label">Name*</label>
@@ -86,7 +86,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="button button-warning" v-on:click.prevent="submitForm()">Jetzt anfragen</button>
+                            <button type="submit" class="button button-warning">Jetzt anfragen</button>
                         </div>
                     </f:form>
                     <div class="form__overlay" v-show="processing">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html
index cf6cfe61..edfa5d25 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html
@@ -9,7 +9,7 @@
                 <div class="form form--border">
                     <f:form id="contactform" object="{contactForm}" name="contactForm"
                             action="processForm" controller="AjaxForm" pluginName="Ajax" pageType="1803"
-                            noCacheHash="1" class="border" additionalAttributes="{v-show: '!success'}">
+                            noCacheHash="1" class="border" additionalAttributes="{'v-show': '!success', '@submit.prevent': 'submitForm()'}">
                         <f:form.hidden property="pageUrl"/>
                         <div class="form-group" :class="{ 'has-error': formErrors.name }">
                             <label for="name" class="control-label">Name</label>
@@ -45,7 +45,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="button button-warning" v-on:click.prevent="submitForm()">Jetzt anfragen</button>
+                            <button type="submit" class="button button-warning">Jetzt anfragen</button>
                         </div>
                     </f:form>
                     <div class="form__overlay" v-show="processing">