diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Clan.java
index 793dbb4568..e91fc26d91 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Clan.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Clan.java
@@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
 	
 	public SubPledge createSubPledge(int pledgeType)
 	{
-		if ((_subPledges == null) || (_subPledges.get(pledgeType) != null))
+		if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
 		{
 			return null;
 		}
 		
-		final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE";
+		final String subPledgeName = "ELITE"; // For now only elite exists.
 		SubPledge subPledge = null;
 		
 		try (Connection con = DatabaseFactory.getConnection();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index 51ef406914..7e8733aa08 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
 	{
 		final L2Clan clan = player.getClan();
 		player.sendPacket(new PledgeShowMemberListAll(clan, true));
-		for (L2PcInstance member : clan.getOnlineMembers(0))
+		for (L2ClanMember member : clan.getMembers())
 		{
 			if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
 			{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index 18cab81922..1b40d9d1b8 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
 		_name = member.getName();
 		_level = member.getLevel();
 		_classId = member.getClassId();
-		_objectId = member.getObjectId();
+		_objectId = member.isOnline() ? member.getObjectId() : 0;
 		_pledgeType = member.getPledgeType();
 		_onlineStatus = member.getOnlineStatus();
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Clan.java
index 793dbb4568..e91fc26d91 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Clan.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Clan.java
@@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
 	
 	public SubPledge createSubPledge(int pledgeType)
 	{
-		if ((_subPledges == null) || (_subPledges.get(pledgeType) != null))
+		if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
 		{
 			return null;
 		}
 		
-		final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE";
+		final String subPledgeName = "ELITE"; // For now only elite exists.
 		SubPledge subPledge = null;
 		
 		try (Connection con = DatabaseFactory.getConnection();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index 51ef406914..7e8733aa08 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
 	{
 		final L2Clan clan = player.getClan();
 		player.sendPacket(new PledgeShowMemberListAll(clan, true));
-		for (L2PcInstance member : clan.getOnlineMembers(0))
+		for (L2ClanMember member : clan.getMembers())
 		{
 			if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
 			{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index 18cab81922..1b40d9d1b8 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
 		_name = member.getName();
 		_level = member.getLevel();
 		_classId = member.getClassId();
-		_objectId = member.getObjectId();
+		_objectId = member.isOnline() ? member.getObjectId() : 0;
 		_pledgeType = member.getPledgeType();
 		_onlineStatus = member.getOnlineStatus();
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2Clan.java
index 793dbb4568..e91fc26d91 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2Clan.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2Clan.java
@@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
 	
 	public SubPledge createSubPledge(int pledgeType)
 	{
-		if ((_subPledges == null) || (_subPledges.get(pledgeType) != null))
+		if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
 		{
 			return null;
 		}
 		
-		final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE";
+		final String subPledgeName = "ELITE"; // For now only elite exists.
 		SubPledge subPledge = null;
 		
 		try (Connection con = DatabaseFactory.getConnection();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index 51ef406914..7e8733aa08 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
 	{
 		final L2Clan clan = player.getClan();
 		player.sendPacket(new PledgeShowMemberListAll(clan, true));
-		for (L2PcInstance member : clan.getOnlineMembers(0))
+		for (L2ClanMember member : clan.getMembers())
 		{
 			if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
 			{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index 18cab81922..1b40d9d1b8 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
 		_name = member.getName();
 		_level = member.getLevel();
 		_classId = member.getClassId();
-		_objectId = member.getObjectId();
+		_objectId = member.isOnline() ? member.getObjectId() : 0;
 		_pledgeType = member.getPledgeType();
 		_onlineStatus = member.getOnlineStatus();
 	}