Index: packet_system.cpp
===================================================================
--- packet_system.cpp	(revision 4172)
+++ packet_system.cpp	(working copy)
@@ -233,13 +233,8 @@
             PChar->loc.destination = destination = ZONE_RESIDENTIAL_AREA;
         }
 
-        if (destination != ZONE_RESIDENTIAL_AREA &&
-            destination != ZONE_214)
-		{
-            zoneutils::GetZone(destination)->IncreaseZoneCounter(PChar);
-		} else {
-            PChar->loc.zone = zoneutils::GetZone(destination);
-        }
+		// Increase zone counter
+        zoneutils::GetZone(destination)->IncreaseZoneCounter(PChar);
 
         firstlogin = true;
 
Index: zone.cpp
===================================================================
--- zone.cpp	(revision 4172)
+++ zone.cpp	(working copy)
@@ -845,11 +845,15 @@
     PChar->loc.destination = 0;
     PChar->m_InsideRegionID = 0;
 
-    PChar->m_PVPFlag = CanUseMisc(MISC_PVP);
-
 	m_charList[PChar->targid] = PChar;
 	ShowDebug(CL_CYAN"CZone:: %s IncreaseZoneCounter <%u> %s \n" CL_RESET, GetName(), m_charList.size(),PChar->GetName());
 
+	// No more processing if residential area
+	if (m_zoneID == ZONE_RESIDENTIAL_AREA ||
+		m_zoneID == ZONE_214)
+	{ return; }
+
+	PChar->m_PVPFlag = CanUseMisc(MISC_PVP);
 	if (!ZoneTimer && !m_charList.empty())
 	{
 		ZoneTimer = CTaskMgr::getInstance()->AddTask(