Refactored authenticator switching feature