Refactor the adding of users