fixed email stuff