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

This reverts commit 09a519de0b90f9f308e046dc1b255af44af8669d.
Updated blue-shell, increased login timeout