Refactor the new check users