Revert "Fix bug on userlist"

This reverts commit ba67b7cea2bcaf1ebf5fb65a5479da219197cea9.