1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index ec4873b35ed..5e6534459e0 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -397,6 +397,14 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recvData)
         }
     }
 
+    // Reserve the name for the duration of callback chain
+    createInfo->NameToken = sCharacterCache->TryCreateCharacterWithName(createInfo->Name);
+    if (!createInfo->NameToken)
+    {
+        SendCharCreate(CHAR_CREATE_NAME_IN_USE);
+        return;
+    }
+
     PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHECK_NAME);
     stmt->setString(0, createInfo->Name);