Fix org/group members disappearing