oauth handshake fix (bad refactor, whoops)