PIM-2716 : fix user groups