Fix user group management