improved contact form handling