Yet more contact form tweaks