Reduce scope of populate and finish userlist v1