#2 fixed emails