some email and group fixes