Fix #533

Completely redone because of a new contact form.
Merge pull request #1043 from stevenmg/patch-8

Redo of #533