A few more changes to user_info_service