diff --git a/world/client.cpp b/world/client.cpp
index 3f875cafe..022bf0d41 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -88,7 +88,6 @@ extern volatile bool UCSServerAvailable_;
 
 Client::Client(EQStreamInterface* ieqs)
 :	autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)),
-	CLE_keepalive_timer(RuleI(World, ClientKeepaliveTimeoutMS)),
 	connect(1000),
 	eqs(ieqs)
 {
@@ -1124,10 +1123,9 @@ bool Client::Process() {
 		SendApproveWorld();
 		connect.Disable();
 	}
-	if (CLE_keepalive_timer.Check()) {
-		if (cle)
-			cle->KeepAlive();
-	}
+
+	if (cle)
+		cle->KeepAlive();
 
 	/************ Get all packets from packet manager out queue and process them ************/
 	EQApplicationPacket *app = 0;
diff --git a/world/client.h b/world/client.h
index d36dc692d..e7ab52fa3 100644
--- a/world/client.h
+++ b/world/client.h
@@ -94,7 +94,6 @@ private:
 	void SetClassLanguages(PlayerProfile_Struct *pp);
 
 	ClientListEntry* cle;
-	Timer	CLE_keepalive_timer;
 	Timer	connect;
 	bool firstlogin;
 	bool seen_character_select;
diff --git a/world/cliententry.cpp b/world/cliententry.cpp
index 67583a614..d9ae26730 100644
--- a/world/cliententry.cpp
+++ b/world/cliententry.cpp
@@ -273,8 +273,8 @@ bool ClientListEntry::CheckStale() {
 	if (stale > 20) {
 		if (pOnline > CLE_Status::Offline)
 			SetOnline(CLE_Status::Offline);
-		else
-			return true;
+
+		return true;
 	}
 	return false;
 }
diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index da14ce71f..cb05e707d 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -41,7 +41,7 @@ extern ZSList			zoneserver_list;
 uint32 numplayers = 0;	//this really wants to be a member variable of ClientList...
 
 ClientList::ClientList()
-: CLStale_timer(45000)
+: CLStale_timer(10000)
 {
 	NextCLEID = 1;
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 6cc05a65f..f0eb00d13 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -1166,8 +1166,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	*/
 	Client* client = entity_list.GetClientByName(cze->char_name);
 	if (!zone->GetAuth(ip, cze->char_name, &WID, &account_id, &character_id, &admin, lskey, &tellsoff)) {
-		Log(Logs::General, Logs::Error, "GetAuth() returned false kicking client");
-		if (client != 0) {
+		Log(Logs::General, Logs::Client_Login, "%s failed zone auth check.", cze->char_name);
+		if (nullptr != client) {
 			client->Save();
 			client->Kick();
 		}
diff --git a/zone/zone.cpp b/zone/zone.cpp
index 185c0e65b..2121642bb 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -1138,6 +1138,7 @@ void Zone::RemoveAuth(uint32 lsid)
 		ZoneClientAuth_Struct* zca = iterator.GetData();
 		if (zca->lsid == lsid) {
 			iterator.RemoveCurrent();
+			continue;
 		}
 		iterator.Advance();
 	}