Different source views for users and admin/moderators
Merge branch 'users-list'