Fix for default-org selection during login

Updated the org/switch command to work with the new menu.