update space/org user management to use options pattern