QAART-288 users and rights refactoring - minor changes