more email form changes