Change Post Handshake auth so that it is opt-in