diff --git a/common/servertalk.h b/common/servertalk.h
index b0197985f..528abfb4b 100644
--- a/common/servertalk.h
+++ b/common/servertalk.h
@@ -663,6 +663,7 @@ struct UsertoWorldRequest_Struct {
 	uint32	worldid;
 	uint32	FromID;
 	uint32	ToID;
+	char	IPAddr[64];
 };
 
 struct UsertoWorldResponse_Struct {
diff --git a/world/client.cpp b/world/client.cpp
index 45d65e494..c7385b41c 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -1022,6 +1022,12 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 			eqs->Close();
 			return true;
 		}
+		case OP_WorldLogout:
+		{
+			eqs->Close();
+			cle->SetOnline(CLE_Status_Offline); //allows this player to log in again without an ip restriction.
+			return false;
+		}
 		case OP_ZoneChange:
 		{
 			// HoT sends this to world while zoning and wants it echoed back.
diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index fd92051b3..23fb44fb0 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -214,6 +214,24 @@ void ClientList::GetCLEIP(uint32 iIP) {
 	}
 }
 
+uint32 ClientList::GetCLEIPCount(uint32 iIP) {
+	ClientListEntry* countCLEIPs = 0;
+	LinkedListIterator<ClientListEntry*> iterator(clientlist);
+
+	int IPInstances = 0;
+	iterator.Reset();
+
+	while (iterator.MoreElements()) {
+		countCLEIPs = iterator.GetData();
+		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) && countCLEIPs->Online() >= CLE_Status_Online) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
+			IPInstances++; // Increment the occurences of this IP address
+		}
+		iterator.Advance();
+	}
+
+	return IPInstances;
+}
+
 void ClientList::DisconnectByIP(uint32 iIP) {
 	ClientListEntry* countCLEIPs = 0;
 	LinkedListIterator<ClientListEntry*> iterator(clientlist);
@@ -252,7 +270,6 @@ ClientListEntry* ClientList::FindCharacter(const char* name) {
 	return 0;
 }
 
-
 ClientListEntry* ClientList::FindCLEByAccountID(uint32 iAccID) {
 	LinkedListIterator<ClientListEntry*> iterator(clientlist);
 
diff --git a/world/clientlist.h b/world/clientlist.h
index 1d5fc6ab8..44ed70a08 100644
--- a/world/clientlist.h
+++ b/world/clientlist.h
@@ -56,6 +56,7 @@ public:
 	ClientListEntry* FindCLEByCharacterID(uint32 iCharID);
 	ClientListEntry* GetCLE(uint32 iID);
 	void	GetCLEIP(uint32 iIP);
+	uint32	GetCLEIPCount(uint32 iLSAccountID);
 	void	DisconnectByIP(uint32 iIP);
 	void	EnforceSessionLimit(uint32 iLSAccountID);
 	void	CLCheckStale();
diff --git a/world/login_server.cpp b/world/login_server.cpp
index b8c23d573..ad5f4ec88 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -134,11 +134,26 @@ bool LoginServer::Process() {
 				if( (int32)numplayers >= x && x != -1 && x != 255 && status < 80)
 					utwrs->response = -3;
 
+
+				if (pack->size == sizeof(UsertoWorldRequest_Struct))
+				{
+					uint32 decimalIP = inet_addr(utwr->IPAddr);
+
+					if (RuleB(World, MaxClientsSimplifiedLogic)) {
+						if (client_list.GetCLEIPCount(decimalIP) >= (RuleI(World, MaxClientsPerIP))) {
+							if ((status < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) {
+								utwrs->response = -4;
+							}
+						}
+					}
+				}
+
 				if(status == -1)
 					utwrs->response = -1;
 				if(status == -2)
 					utwrs->response = -2;
 
+
 				utwrs->worldid = utwr->worldid;
 				SendPacket(outpack);
 				delete outpack;