Fix #533

Completely redone because of a new contact form.