COOK-2210 New way to manage users