Revert "Fixing errors with user list"

This reverts commit 1441f7a5baf666eb170a2a14e5dad663f1afc828.