diff --git a/world/client.cpp b/world/client.cpp
index 4fd157088..aaf7d4c9c 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -1281,6 +1281,10 @@ void Client::Clearance(int8 response)
 		} else {
 			zs_addr = zs->GetIP().c_str();
 
+			if (!zs_addr[0]) {
+				zs_addr = WorldConfig::get()->LocalAddress.c_str();
+			}
+
 			if(strcmp(zs_addr, "127.0.0.1") == 0)
 			{
 				Log(Logs::Detail, Logs::World_Server, "Local zone address was %s, setting local address to: %s", zs_addr, WorldConfig::get()->LocalAddress.c_str());
diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp
index ea5bb16d9..4d39717b5 100644
--- a/zone/fearpath.cpp
+++ b/zone/fearpath.cpp
@@ -173,7 +173,5 @@ void Mob::CalculateNewFearpoint()
 	}
 	if (currently_fleeing)
         m_FearWalkTarget = glm::vec3(ranx, rany, ranz);
-	else //Break fear
-		BuffFadeByEffect(SE_Fear);
 }
 
diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index 4b98eccd1..fc9cd51a3 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -3644,7 +3644,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
 
 		case SE_Fear: {
 			if (zone->random.Roll(RuleI(Spells, FearBreakCheckChance))) {
-				float resist_check = ResistSpell(spells[buff.spellid].resisttype, buff.spellid, caster);
+				float resist_check = ResistSpell(spells[buff.spellid].resisttype, buff.spellid, caster,0,0,true);
 
 				if (resist_check == 100)
 					break;