diff --git a/changelog.txt b/changelog.txt
index 9eaba6158..03aa3bc32 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 Kayen: Implemented support for spell target type (45) 'Target Rings' on Underfoot (does work earlier expansions)
 Thanks to Lecht for figuring out the op_code side.
 Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
+JJ: Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
 Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql
 
 == 11/06/2014 ==
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index a5fdd3c92..7bc91f0f5 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4038,6 +4038,10 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 			return;
 		}
 
+		targetring_x = castspell->x_pos;
+		targetring_y = castspell->y_pos;
+		targetring_z = castspell->z_pos;
+
 		CastSpell(spell_to_cast, castspell->target_id, castspell->slot);
 	}
 	/* Spell Slot or Potion Belt Slot */
diff --git a/zone/effects.cpp b/zone/effects.cpp
index e5c631aaa..02060c10b 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -765,10 +765,10 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
 		if (curmob == caster && !affect_caster)	//watch for caster too
 			continue;
 
-		if (spells[spell_id].targettype == ST_Ring){
-			dist_targ = curmob->DistNoRoot(caster->GetTargetRingX(), caster->GetTargetRingY(),caster->GetTargetRingZ());
+		if (spells[spell_id].targettype == ST_Ring) {
+			dist_targ = curmob->DistNoRoot(caster->GetTargetRingX(), caster->GetTargetRingY(), caster->GetTargetRingZ());
 		}
-		else if (center){
+		else if (center) {
 			dist_targ = center->DistNoRoot(*curmob);
 		}
 
@@ -795,7 +795,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
 				continue;
 			if (center && !center->CheckLosFN(curmob))
 				continue;
-			if  (!center && !caster->CheckLosFN(caster->GetTargetRingX(), caster->GetTargetRingY(),caster->GetTargetRingZ(), curmob->GetSize()))
+			if (!center && !caster->CheckLosFN(caster->GetTargetRingX(), caster->GetTargetRingY(), caster->GetTargetRingZ(), curmob->GetSize()))
 				continue;
 		} else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
 			// This does not check faction for beneficial AE buffs..only agro and attackable.
diff --git a/zone/spells.cpp b/zone/spells.cpp
index af06f26ae..2e5e16f46 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -2175,7 +2175,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
 			break;
 		}
 
-		case TargetRing:{
+		case TargetRing:
+		{
 			entity_list.AESpell(this, nullptr, spell_id, false, resist_adjust);
 			break;
 		}