diff --git a/lib/client/CServerProxy.cpp b/lib/client/CServerProxy.cpp
index 88ae2c9d..c72dc12f 100644
--- a/lib/client/CServerProxy.cpp
+++ b/lib/client/CServerProxy.cpp
@@ -136,14 +136,18 @@ CServerProxy::parseHandshakeMessage(const UInt8* code)
 		infoAcknowledgment();
 	}
 
-	else if (memcmp(code, kMsgCResetOptions, 4) == 0) {
-		resetOptions();
+	else if (memcmp(code, kMsgDSetOptions, 4) == 0) {
+		setOptions();
 
 		// handshake is complete
 		m_parser = &CServerProxy::parseMessage;
 		EVENTQUEUE->addEvent(CEvent(getHandshakeCompleteEvent(), this));
 	}
 
+	else if (memcmp(code, kMsgCResetOptions, 4) == 0) {
+		resetOptions();
+	}
+
 	else if (memcmp(code, kMsgCNoop, 4) == 0) {
 		// accept and discard no-op
 	}