Fix for default-org selection during login