changed the way handling nonprimary emails