changing email handling