More contact form bug fixes.