Couple of fixes in user and user-groups modules