diff --git a/modules/70/1/output.php b/modules/70/1/output.php
index 8be6b43..ae7b209 100644
--- a/modules/70/1/output.php
+++ b/modules/70/1/output.php
@@ -965,16 +965,15 @@ function recalc() {
 				php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
 
 				html||<br>* '. $tag_open .'d2u_immo_form_required'. $tag_close .'<br><br>
-				captcha|'. $tag_open .'d2u_immo_form_captcha'. $tag_close .'|'. $tag_open .'d2u_immo_form_validate_captcha'. $tag_close .'|'. rex_getUrl('', '', ['property_id' => $property->property_id]) .'
 
 				submit|submit|'. $tag_open .'d2u_immo_form_send'. $tag_close .'|no_db
 
 				validate|empty|name|'. $tag_open .'d2u_immo_form_validate_name'. $tag_close .'
 				validate|empty|phone|'. $tag_open .'d2u_immo_form_validate_phone'. $tag_close .'
 				validate|empty|email|'. $tag_open .'d2u_immo_form_validate_email'. $tag_close .'
-				validate|email|email|'. $tag_open .'d2u_immo_form_validate_email_false'. $tag_close .'
+				validate|type|email|email|'. $tag_open .'d2u_immo_form_validate_email_false'. $tag_close .'
 				validate|empty|privacy_policy_accepted|'. $tag_open .'d2u_immo_form_validate_privacy_policy'. $tag_close .'
-				validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_immo_form_validate_spambots'. $tag_close .'|
+				validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_immo_form_validate_spambots'. $tag_close .'|
 
 				action|tpl2email|d2u_immo_request|emaillabel|'. $property->contact->email;
 
@@ -1011,19 +1010,18 @@ function recalc() {
 				php|immo_contact_validate_timer|Spamprotection|<input name="immo_contact_validate_timer" type="hidden" value="'. microtime(true) .'" />|
 
 				html||<br>* '. $tag_open .'d2u_immo_form_required'. $tag_close .'<br><br>
-				captcha|'. $tag_open .'d2u_immo_form_captcha'. $tag_close .'|'. $tag_open .'d2u_immo_form_validate_captcha'. $tag_close .'|'. rex_getUrl('', '', ['property_id' => $property->property_id]) .'
 				html||<br>* '. $tag_open .'d2u_immo_recommendation_privacy_policy'. $tag_close .'<br><br>
 
 				submit|submit|'. $tag_open .'d2u_immo_form_send'. $tag_close .'|no_db
 
 				validate|empty|sender_name|'. $tag_open .'d2u_immo_recommendation_validate_sender_name'. $tag_close .'
 				validate|empty|sender_mail|'. $tag_open .'d2u_immo_recommendation_validate_sender_mail'. $tag_close .'
-				validate|email|sender_mail|'. $tag_open .'d2u_immo_recommendation_validate_sender_mail'. $tag_close .'
+				validate|type|sender_mail|email|'. $tag_open .'d2u_immo_recommendation_validate_sender_mail'. $tag_close .'
 				validate|empty|receipient_name|'. $tag_open .'d2u_immo_recommendation_validate_receipient_name'. $tag_close .'
 				validate|empty|receipient_mail|'. $tag_open .'d2u_immo_recommendation_validate_receipient_mail'. $tag_close .'
-				validate|email|receipient_mail|'. $tag_open .'d2u_immo_recommendation_validate_receipient_mail'. $tag_close .'
+				validate|type|receipient_mail|email|'. $tag_open .'d2u_immo_recommendation_validate_receipient_mail'. $tag_close .'
 				validate|empty|message|'. $tag_open .'d2u_immo_recommendation_validate_message'. $tag_close .'
-				validate|customfunction|immo_contact_validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_immo_form_validate_spambots'. $tag_close .'|
+				validate|customfunction|immo_contact_validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_immo_form_validate_spambots'. $tag_close .'|
 
 				action|callback|sendRecommendation';
 
diff --git a/package.yml b/package.yml
index a1df822..e9eabc8 100644
--- a/package.yml
+++ b/package.yml
@@ -25,5 +25,5 @@ requires:
         media_manager: '>=2.2'
         sprog: '>=1.0.0'
         url: '>=1.0.1'
-        yform: '>=2.0'
+        yform: '>=3.0'
         yrewrite: '>=2.0.1'
\ No newline at end of file