diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 7bb193bc87..7bd0f2a8de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -70,8 +70,19 @@ public final class CpHeal extends AbstractEffect
 			target.setCurrentCp(amount + target.getCurrentCp());
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		target.sendPacket(sm);
+		final L2Character caster = info.getEffector();
+		if ((caster != null) && (caster != target))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(caster.getName());
+			sm.addInt((int) amount);
+			target.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			target.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index 52e89065a3..847bb3a903 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -66,8 +66,19 @@ public final class CpHealPercent extends AbstractEffect
 			target.setCurrentCp(amount + target.getCurrentCp());
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		target.sendPacket(sm);
+		final L2Character caster = info.getEffector();
+		if ((caster != null) && (caster != target))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(caster.getName());
+			sm.addInt((int) amount);
+			target.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			target.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
index 7d5879cc18..64e3d6d4fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java
@@ -99,9 +99,20 @@ public final class MaxCp extends AbstractEffect
 		}
 		if (_heal)
 		{
-			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-			sm.addInt((int) amount);
-			effected.sendPacket(sm);
+			final L2Character caster = info.getEffector();
+			if ((caster != null) && (caster != effected))
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+				sm.addString(caster.getName());
+				sm.addInt((int) amount);
+				effected.sendPacket(sm);
+			}
+			else
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+				sm.addInt((int) amount);
+				effected.sendPacket(sm);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java
index 26d5cf52d1..a777dad662 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java
@@ -100,9 +100,20 @@ public final class MaxHp extends AbstractEffect
 		}
 		if (_heal)
 		{
-			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
-			sm.addInt((int) amount);
-			effected.sendPacket(sm);
+			final L2Character caster = info.getEffector();
+			if ((caster != null) && (caster != effected))
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
+				sm.addString(caster.getName());
+				sm.addInt((int) amount);
+				effected.sendPacket(sm);
+			}
+			else
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
+				sm.addInt((int) amount);
+				effected.sendPacket(sm);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 6d1905f392..186137d565 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index d7c3dbf3f9..94d2ff3c6b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 			effected.broadcastStatusUpdate(effector);
 		}
 		
-		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
-		sm.addInt((int) amount);
-		effected.sendPacket(sm);
+		if ((effector != null) && (effector != effected))
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
+			sm.addString(effector.getName());
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
+		else
+		{
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
+			sm.addInt((int) amount);
+			effected.sendPacket(sm);
+		}
 	}
 }