Avoid duplication of edited team member (#4997)