diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index 1aed0bdf7..3f18b6517 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -173,12 +173,19 @@ bool EXT_FUNC CBasePlayer::__API_HOOK(SetClientUserInfoName)(char *infobuffer, c
 	}
 #endif
 
-#ifdef REGAMEDLL_API
-	if (!CSPlayer()->CanChangeName())
+#ifdef REGAMEDLL_ADD
+	if (max_alive_name_changes.value <= 0)
+	{
+		ClientPrint(pev, HUD_PRINTCENTER, "#Command_Not_Available");
 		return false;
+	}
 #endif
 
-	if (pev->deadflag != DEAD_NO)
+	if (pev->deadflag != DEAD_NO
+#if defined REGAMEDLL_API && REGAMEDLL_ADD
+		|| CSPlayer()->m_iAliveNameChanges >= max_alive_name_changes.value
+#endif
+		)
 	{
 		m_bHasChangedName = true;
 		Q_snprintf(m_szNewName, sizeof(m_szNewName), "%s", szNewName);
diff --git a/regamedll/public/regamedll/API/CSPlayer.h b/regamedll/public/regamedll/API/CSPlayer.h
index 5619397af..9ce4c15d0 100644
--- a/regamedll/public/regamedll/API/CSPlayer.h
+++ b/regamedll/public/regamedll/API/CSPlayer.h
@@ -107,7 +107,6 @@ class CCSPlayer: public CCSMonster {
 	void OnKilled();
 
 	CBasePlayer *BasePlayer() const;
-	bool CanChangeName() const;
 
 public:
 	enum EProtectionState
@@ -136,16 +135,6 @@ class CCSPlayer: public CCSMonster {
 	int m_iAliveNameChanges;
 };
 
-inline bool CCSPlayer::CanChangeName() const
-{
-#ifdef REGAMEDLL_ADD
-	if (max_alive_name_changes.value >= 0 && m_iAliveNameChanges >= max_alive_name_changes.value)
-		return false;
-#endif
-
-	return true;
-}
-
 // Inlines
 inline CBasePlayer *CCSPlayer::BasePlayer() const
 {