update space/org user management to use options pattern

(cherry picked from commit 189103068e61c3947992e1d580b1d57c293906d6)