some email form fixes