Changes to get it working with GoogleAuthenticator