[FIX] CSRF/Re-captcha on Contactform

Fixes #1666
Merge branch 'fix-contactform' into next