Updated contact form logic