[SD-974] refactoring to code to use user list.