diff --git a/extension.cpp b/extension.cpp
index d50b3a7..c7721bc 100644
--- a/extension.cpp
+++ b/extension.cpp
@@ -195,6 +195,8 @@ public:
 	uint64 ullSteamID;
 	ValidateAuthTicketResponse_t ValidateAuthTicketResponse;
 	bool GotValidateAuthTicketResponse;
+	bool SteamLegal;
+	bool SteamAuthFailed;
 
 	ConnectClientStorage() { }
 	ConnectClientStorage(netadr_t address, int nProtocol, int iChallenge, int iClientChallenge, int nAuthProtocol, const char *pchName, const char *pchPassword, const char *pCookie, int cbCookie)
@@ -209,6 +211,8 @@ public:
 		strncpy(this->pCookie, pCookie, sizeof(this->pCookie));
 		this->cbCookie = cbCookie;
 		this->GotValidateAuthTicketResponse = false;
+		this->SteamLegal = false;
+		this->SteamAuthFailed = false;
 	}
 };
 StringHashMap<ConnectClientStorage> g_ConnectClientStorage;
@@ -222,11 +226,19 @@ DETOUR_DECL_MEMBER1(CSteam3Server__OnValidateAuthTicketResponse, int, ValidateAu
 	char aSteamID[32];
 	V_strncpy(aSteamID, pResponse->m_SteamID.Render(), sizeof(aSteamID));
 
+	bool SteamLegal = pResponse->m_eAuthSessionResponse == k_EAuthSessionResponseOK;
+	bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
+	if(!SteamLegal && force)
+		pResponse->m_eAuthSessionResponse = k_EAuthSessionResponseOK;
+
+	printf("SteamLegal: %d\n", SteamLegal);
+
 	ConnectClientStorage Storage;
 	if(g_ConnectClientStorage.retrieve(aSteamID, &Storage))
 	{
 		Storage.GotValidateAuthTicketResponse = true;
 		Storage.ValidateAuthTicketResponse = *pResponse;
+		Storage.SteamLegal = SteamLegal;
 		g_ConnectClientStorage.replace(aSteamID, Storage);
 	}
 
@@ -269,7 +281,7 @@ DETOUR_DECL_MEMBER9(CBaseServer__ConnectClient, IClient *, netadr_t &, address,
 	// This can happen if the async ClientPreConnectEx takes too long to be called
 	// and the client auto-retries.
 	bool AsyncWaiting = false;
-	ConnectClientStorage Storage;
+	ConnectClientStorage Storage(address, nProtocol, iChallenge, iClientChallenge, nAuthProtocol, pchName, pchPassword, pCookie, cbCookie);
 	if(g_ConnectClientStorage.retrieve(aSteamID, &Storage))
 	{
 		g_ConnectClientStorage.remove(aSteamID);
@@ -281,12 +293,17 @@ DETOUR_DECL_MEMBER9(CBaseServer__ConnectClient, IClient *, netadr_t &, address,
 			AsyncWaiting = true;
 	}
 
-	bool noSteam = g_SvNoSteam.GetInt() || !BLoggedOn();
+	bool NoSteam = g_SvNoSteam.GetInt() || !BLoggedOn();
+	bool SteamAuthFailed = false;
 	EBeginAuthSessionResult result = BeginAuthSession(pvTicket, cbTicket, g_lastClientSteamID);
-	if(result != k_EBeginAuthSessionResultOK && !noSteam)
+	if(result != k_EBeginAuthSessionResultOK)
 	{
-		RejectConnection(address, iClientChallenge, "#GameUI_ServerRejectSteam");
-		return NULL;
+		if(!NoSteam)
+		{
+			RejectConnection(address, iClientChallenge, "#GameUI_ServerRejectSteam");
+			return NULL;
+		}
+		Storage.SteamAuthFailed = SteamAuthFailed = true;
 	}
 
 	char rejectReason[255];
@@ -305,26 +322,29 @@ DETOUR_DECL_MEMBER9(CBaseServer__ConnectClient, IClient *, netadr_t &, address,
 		pchPassword = passwordBuffer;
 	}
 
+	printf("SteamAuthFailed: %d | retVal = %d\n", SteamAuthFailed, retVal);
+
 	// k_OnClientPreConnectEx_Reject
 	if(retVal == 0)
 	{
+		g_ConnectClientStorage.remove(aSteamID);
 		RejectConnection(address, iClientChallenge, rejectReason);
 		return NULL;
 	}
 
+	Storage.pThis = this;
+	Storage.ullSteamID = ullSteamID;
+	Storage.SteamAuthFailed = SteamAuthFailed;
+
+	if(!g_ConnectClientStorage.replace(aSteamID, Storage))
+	{
+		RejectConnection(address, iClientChallenge, "Internal error.");
+		return NULL;
+	}
+
 	// k_OnClientPreConnectEx_Async
 	if(retVal == -1)
 	{
-		ConnectClientStorage Storage(address, nProtocol, iChallenge, iClientChallenge, nAuthProtocol, pchName, pchPassword, pCookie, cbCookie);
-		Storage.pThis = this;
-		Storage.ullSteamID = ullSteamID;
-
-		if(!g_ConnectClientStorage.replace(aSteamID, Storage))
-		{
-			RejectConnection(address, iClientChallenge, "Internal error.");
-			return NULL;
-		}
-
 		return NULL;
 	}
 
@@ -332,11 +352,11 @@ DETOUR_DECL_MEMBER9(CBaseServer__ConnectClient, IClient *, netadr_t &, address,
 	g_bSuppressCheckChallengeType = true;
 	IClient *pClient = DETOUR_MEMBER_CALL(CBaseServer__ConnectClient)(address, nProtocol, iChallenge, iClientChallenge, nAuthProtocol, pchName, pchPassword, pCookie, cbCookie);
 
-	if(pClient && (noSteam || g_SvForceSteam.GetInt()))
+	if(pClient && SteamAuthFailed)
 	{
 		ValidateAuthTicketResponse_t Response;
 		Response.m_SteamID = g_lastClientSteamID;
-		Response.m_eAuthSessionResponse = k_EAuthSessionResponseOK;
+		Response.m_eAuthSessionResponse = k_EAuthSessionResponseAuthTicketInvalid;
 		Response.m_OwnerSteamID = Response.m_SteamID;
 		DETOUR_MEMBER_MCALL_CALLBACK(CSteam3Server__OnValidateAuthTicketResponse, g_pSteam3Server)(&Response);
 	}
@@ -527,8 +547,6 @@ cell_t ClientPreConnectEx(IPluginContext *pContext, const cell_t *params)
 	if(!g_ConnectClientStorage.retrieve(pSteamID, &Storage))
 		return 1;
 
-	g_ConnectClientStorage.remove(pSteamID);
-
 	if(retVal == 0)
 	{
 		RejectConnection(Storage.address, Storage.iClientChallenge, rejectReason);
@@ -542,8 +560,10 @@ cell_t ClientPreConnectEx(IPluginContext *pContext, const cell_t *params)
 	if(!pClient)
 		return 1;
 
-	if(g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn())
+	bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
+	if(Storage.SteamAuthFailed && force && !Storage.GotValidateAuthTicketResponse)
 	{
+		printf("Force ValidateAuthTicketResponse\n");
 		Storage.ValidateAuthTicketResponse.m_SteamID = CSteamID(Storage.ullSteamID);
 		Storage.ValidateAuthTicketResponse.m_eAuthSessionResponse = k_EAuthSessionResponseOK;
 		Storage.ValidateAuthTicketResponse.m_OwnerSteamID = Storage.ValidateAuthTicketResponse.m_SteamID;
@@ -552,14 +572,32 @@ cell_t ClientPreConnectEx(IPluginContext *pContext, const cell_t *params)
 
 	// Make sure this is always called in order to verify the client on the server
 	if(Storage.GotValidateAuthTicketResponse)
+	{
+		printf("Replay ValidateAuthTicketResponse\n");
 		DETOUR_MEMBER_MCALL_ORIGINAL(CSteam3Server__OnValidateAuthTicketResponse, g_pSteam3Server)(&Storage.ValidateAuthTicketResponse);
+	}
 
 	return 0;
 }
 
+cell_t SteamClientAuthenticated(IPluginContext *pContext, const cell_t *params)
+{
+	char *pSteamID;
+	pContext->LocalToString(params[1], &pSteamID);
+
+	ConnectClientStorage Storage;
+	if(g_ConnectClientStorage.retrieve(pSteamID, &Storage))
+	{
+		return Storage.SteamLegal;
+	}
+
+	return false;
+}
+
 const sp_nativeinfo_t MyNatives[] =
 {
 	{ "ClientPreConnectEx", ClientPreConnectEx },
+	{ "SteamClientAuthenticated", SteamClientAuthenticated },
 	{ NULL, NULL }
 };
 
@@ -567,3 +605,13 @@ void Connect::SDK_OnAllLoaded()
 {
 	sharesys->AddNatives(myself, MyNatives);
 }
+
+void Connect::OnClientDisconnecting(int client)
+{
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
+	if(pPlayer)
+	{
+		const char *pSteamID = pPlayer->GetSteam2Id(false);
+		g_ConnectClientStorage.remove(pSteamID);
+	}
+}
diff --git a/extension.h b/extension.h
index 28c7372..05b0a5c 100644
--- a/extension.h
+++ b/extension.h
@@ -46,7 +46,8 @@
  */
 class Connect :
 	public SDKExtension,
-	public IConCommandBaseAccessor
+	public IConCommandBaseAccessor,
+	public IClientListener
 {
 public:
 	/**
@@ -119,6 +120,9 @@ public:
 
 public:  // IConCommandBaseAccessor
 	virtual bool RegisterConCommandBase(ConCommandBase *pVar);
+
+public: // IClientListener
+	void OnClientDisconnecting(int client);
 };
 
 #endif // _INCLUDE_SOURCEMOD_EXTENSION_PROPER_H_
diff --git a/include/connect.inc b/include/connect.inc
index e651d2c..bc4aa1f 100644
--- a/include/connect.inc
+++ b/include/connect.inc
@@ -13,6 +13,7 @@ enum EConnect
 forward EConnect OnClientPreConnectEx(const char[] sName, char sPassword[255], const char[] sIP, const char[] sSteam32ID, char sRejectReason[255]);
 
 native bool ClientPreConnectEx(const char[] sSteam32ID, EConnect RetVal, char sRejectReason[255]);
+native bool SteamClientAuthenticated(const char[] sSteam32ID);
 
 /**
  * Do not edit below this line!
diff --git a/smsdk_config.h b/smsdk_config.h
index a711d5d..68c41c9 100644
--- a/smsdk_config.h
+++ b/smsdk_config.h
@@ -40,7 +40,7 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Connect"
 #define SMEXT_CONF_DESCRIPTION	"Forward for early connection"
-#define SMEXT_CONF_VERSION		"2.2"
+#define SMEXT_CONF_VERSION		"2.3"
 #define SMEXT_CONF_AUTHOR		"Asher \"asherkin\" Baker + BotoX"
 #define SMEXT_CONF_URL			"https://github.com/CSSZombieEscape/sm-ext-connect"
 #define SMEXT_CONF_LOGTAG		"CONNECT"
@@ -61,7 +61,7 @@
 /** Enable interfaces you want to use here by uncommenting lines */
 #define SMEXT_ENABLE_FORWARDSYS
 //#define SMEXT_ENABLE_HANDLESYS
-//#define SMEXT_ENABLE_PLAYERHELPERS
+#define SMEXT_ENABLE_PLAYERHELPERS
 //#define SMEXT_ENABLE_DBMANAGER
 #define SMEXT_ENABLE_GAMECONF
 //#define SMEXT_ENABLE_MEMUTILS