diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index 284bfab0..272b1dee 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -699,6 +699,11 @@ void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
m_clinfochanged->PushCell(client);
m_clinfochanged->Execute(&res, NULL);
+ if (pPlayer->IsFakeClient())
+ {
+ return;
+ }
+
IPlayerInfo *info = pPlayer->GetPlayerInfo();
const char *new_name = info ? info->GetName() : engine->GetClientConVarValue(client, "name");
const char *old_name = pPlayer->m_Name.c_str();
diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj
index ca859094..818ec2fc 100644
--- a/core/msvc9/sourcemod_mm.vcproj
+++ b/core/msvc9/sourcemod_mm.vcproj
@@ -40,9 +40,10 @@
/>