Hi again,
If you select “Both” and the Prompt for Credentials option as the Login Flow, after you save the changes, it shouldn’t ask you for an organization. I have tested to make sure. Try again and make sure the changes get saved.
Have a good one,
Vlad