Switch to authentication with more relevant framework