diff --git a/world/ucs.cpp b/world/ucs.cpp
index de642fe0d..b745005d4 100644
--- a/world/ucs.cpp
+++ b/world/ucs.cpp
@@ -36,25 +36,25 @@ void UCSConnection::ProcessPacket(uint16 opcode, EQ::Net::Packet &p)
 
 	switch (opcode)
 	{
-	case 0:
-		break;
+		case 0:
+			break;
 
-	case ServerOP_KeepAlive:
-	{
-		// ignore this
-		break;
-	}
-	case ServerOP_ZAAuth:
-	{
-		Log(Logs::Detail, Logs::UCS_Server, "Got authentication from UCS when they are already authenticated.");
-		break;
-	}
-	default:
-	{
-		Log(Logs::Detail, Logs::UCS_Server, "Unknown ServerOPcode from UCS 0x%04x, size %d", opcode, pack->size);
-		DumpPacket(pack->pBuffer, pack->size);
-		break;
-	}
+		case ServerOP_KeepAlive:
+		{
+			// ignore this
+			break;
+		}
+		case ServerOP_ZAAuth:
+		{
+			Log(Logs::Detail, Logs::UCS_Server, "Got authentication from UCS when they are already authenticated.");
+			break;
+		}
+		default:
+		{
+			Log(Logs::Detail, Logs::UCS_Server, "Unknown ServerOPcode from UCS 0x%04x, size %d", opcode, pack->size);
+			DumpPacket(pack->pBuffer, pack->size);
+			break;
+		}
 	}
 }
 
diff --git a/zone/attack.cpp b/zone/attack.cpp
index f8c40ce11..fc8898d32 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -3353,7 +3353,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 
 		SetHP(GetHP() - damage);
 
-		if (IsClient())
+		if (IsClient() && RuleB(Character, MarqueeHPUpdates))
 			this->CastToClient()->SendHPUpdateMarquee();
 
 		if (HasDied()) {