Mail form bug fix