refactored account/user/team creation