users and groups management improvements