Email form, bugs fixing