Changed some logic in the mail form