Updates to some edge cases with multiple accounts of different groups.