Testing the Auto Switch

Let's see if this handles it as expected to give a better UX Flow for the user. New feature seem to works fine.