More work on user list