diff --git a/src/client/game.cpp b/src/client/game.cpp
index 551ac8f9..ee899fac 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1472,7 +1472,7 @@ void Game::setProtocolVersion(int version)
     {
         enableFeature(Otc::GameLooktypeU16);
         enableFeature(Otc::GameMessageStatements);
-        enableFeature(Otc::GameWritableDate);   // might not be since 770
+        enableFeature(Otc::GameWritableDate);
     }
 
     if(version >= 780)
@@ -1485,15 +1485,18 @@ void Game::setProtocolVersion(int version)
         enableFeature(Otc::GameNewOutfitProtocol);
     }
 
+    if(version >= 780 && version <= 854) {          // 780 might not be accurate
+        enableFeature(Otc::GameChargeableItems);
+    }
+
     if(version >= 840) {
         enableFeature(Otc::GameProtocolChecksum);
-        enableFeature(Otc::GameChallengeOnLogin);
         enableFeature(Otc::GameAccountNames);
         enableFeature(Otc::GameDoubleFreeCapacity);
     }
 
-    if(version >= 780 && version <= 854) {          // 780 might not be accurate
-        enableFeature(Otc::GameChargeableItems);
+    if(version >= 841) {
+        enableFeature(Otc::GameChallengeOnLogin);
     }
 
     if(version >= 854) {
diff --git a/src/client/protocolgame.cpp b/src/client/protocolgame.cpp
index a6654d51..1bba2dc0 100644
--- a/src/client/protocolgame.cpp
+++ b/src/client/protocolgame.cpp
@@ -56,7 +56,7 @@ void ProtocolGame::onRecv(const InputMessagePtr& inputMessage)
     if(m_firstRecv) {
         m_firstRecv = false;
 
-        if(g_game.getProtocolVersion() > 810) {
+        if(g_game.getProtocolVersion() >= 841) { // not sure since which version this is, but it seems to be after 8.40
             int size = inputMessage->getU16();
             if(size != inputMessage->getUnreadSize()) {
                 g_logger.traceError("invalid message size");