Fixed user verification in handshake