#POULPE-456 Minor refactoring of user groups