Use handshake instead of emailauth