Clean up the new user form for teams