Switching organizations prompts for the space when it's not provided.

[#47818631]