diff --git a/ScoreboardExt/Classes/KFScoreBoard.uc b/ScoreboardExt/Classes/KFScoreBoard.uc
index dc2112e..92ab894 100644
--- a/ScoreboardExt/Classes/KFScoreBoard.uc
+++ b/ScoreboardExt/Classes/KFScoreBoard.uc
@@ -334,8 +334,9 @@ function DrawPlayerEntry( Canvas C, int Index, float YOffset, float Height, floa
 	KFPRI = KFPRIArray[Index];
 	
 	HasRank = false;
+
 	PlayerInfoIndex = RankRelations.Find('UID', KFPRI.UniqueId);
-	if (PlayerInfoIndex != INDEX_NONE )
+	if (PlayerInfoIndex != INDEX_NONE && RankRelations[PlayerInfoIndex].RankID != INDEX_NONE)
 	{
 		PlayerRankIndex = CustomRanks.Find('ID', RankRelations[PlayerInfoIndex].RankID);
 		if (PlayerRankIndex != INDEX_NONE)
diff --git a/ScoreboardExt/Classes/ScoreboardExtMut.uc b/ScoreboardExt/Classes/ScoreboardExtMut.uc
index 21fecc4..84cdbcb 100644
--- a/ScoreboardExt/Classes/ScoreboardExtMut.uc
+++ b/ScoreboardExt/Classes/ScoreboardExtMut.uc
@@ -202,23 +202,27 @@ private function AddPlayer(Controller C)
 	RepClientNew.RepInfo.Settings = Settings;
 	RepClientNew.RepInfo.RankRelation.UID = KFPC.PlayerReplicationInfo.UniqueId;
 	RepClientNew.RepInfo.RankRelation.RankID = UIDRankRelationsPlayers.Find('UID', RepClientNew.RepInfo.RankRelation.UID);
-	UIDRankRelationsActive.AddItem(RepClientNew.RepInfo.RankRelation);
 	
 	RepClients.AddItem(RepClientNew);
 	
-	foreach UIDRankRelationsActive(Relation) // For this player
+	foreach UIDRankRelationsActive(Relation)
 		RepClientNew.RepInfo.AddRankRelation(Relation);
 	
 	RepClientNew.RepInfo.StartFirstTimeReplication();
 	
-	foreach RepClients(RepClient) // For other players
-		RepClient.RepInfo.AddRankRelation(Relation);
+	if (RepClientNew.RepInfo.RankRelation.RankID != INDEX_NONE)
+	{
+		UIDRankRelationsActive.AddItem(RepClientNew.RepInfo.RankRelation);
+		foreach RepClients(RepClient)
+			RepClient.RepInfo.AddRankRelation(RepClientNew.RepInfo.RankRelation);
+	}
 }
 
 private function RemovePlayer(Controller C)
 {
 	local KFPlayerController KFPC;
-	local int Index;
+	local int Index, i;
+	local UniqueNetId UID;
 
 	`callstack();
 
@@ -226,9 +230,13 @@ private function RemovePlayer(Controller C)
 	if (KFPC == None)
 		return;
 
-	// UID = KFPC.PlayerReplicationInfo.UniqueId;
-	// Remove Rank Relation here
-	
+	UID = KFPC.PlayerReplicationInfo.UniqueId;
+	Index = UIDRankRelationsActive.Find('UID', UID);
+	if (Index != INDEX_NONE)
+		for (i = 0; i < UIDRankRelationsActive.Length; ++i)
+			if (Index != i)
+				RepClients[i].RepInfo.RemoveRankRelation(UIDRankRelationsActive[Index]);
+
 	Index = RepClients.Find('KFPC', KFPC);
 	if (Index == INDEX_NONE)
 		return;
@@ -239,20 +247,6 @@ private function RemovePlayer(Controller C)
 	RepClients.Remove(Index, 1);
 }
 
-/*
-private function RemoveRankRelationByUID(UniqueNetId UID)
-{
-	local int Index;
-	Index = UIDRankRelationsActive.Find('UID', UID);
-	if (Index != INDEX_NONE)
-	{
-		Relation = UIDRankRelationsActive[Index];
-		for (i = 0; i < UIDRankRelationsActive.Length; ++i)
-			RepClients[Index].RepInfo.RemoveRankRelation(Relation);
-	}
-}
-*/
-
 public function UpdatePlayerRank(UIDRankRelation Rel)
 {
 	local SClient RepClient;
@@ -261,9 +255,10 @@ public function UpdatePlayerRank(UIDRankRelation Rel)
 	`callstack();
 	
 	Index = UIDRankRelationsActive.Find('UID', Rel.UID);
-	
 	if (Index != INDEX_NONE)
 		UIDRankRelationsActive[Index] = Rel;
+	else
+		UIDRankRelationsActive.AddItem(Rel);
 	
 	foreach RepClients(RepClient)
 		RepClient.RepInfo.UpdateRankRelation(Rel);
diff --git a/ScoreboardExt/Classes/ScoreboardExtRepInfo.uc b/ScoreboardExt/Classes/ScoreboardExtRepInfo.uc
index 83046af..ebb4cf7 100644
--- a/ScoreboardExt/Classes/ScoreboardExtRepInfo.uc
+++ b/ScoreboardExt/Classes/ScoreboardExtRepInfo.uc
@@ -227,6 +227,8 @@ private reliable client function ClientUpdateRankRelation(UIDRankRelation Rel)
 	
 	if (Index != INDEX_NONE)
 		RankRelations[Index] = Rel;
+	else
+		RankRelations.AddItem(Rel);
 
 	ClientApplyRankRelations();
 }
@@ -234,11 +236,10 @@ private reliable client function ClientUpdateRankRelation(UIDRankRelation Rel)
 defaultproperties
 {
 	bAlwaysRelevant = false;
-    bOnlyRelevantToOwner = true;
-    Role = ROLE_Authority;
-    RemoteRole = ROLE_SimulatedProxy;
-    // This is needed, otherwise the client-to-server RPC fails
-    bSkipActorPropertyReplication = false;
+	bOnlyRelevantToOwner = true;
+	Role = ROLE_Authority;
+	RemoteRole = ROLE_SimulatedProxy;
+	bSkipActorPropertyReplication = false; // This is needed, otherwise the client-to-server RPC fails
 
 	CustomRanksRepProgress = 0;
 	SteamGroupsRepProgress = 0;
diff --git a/ScoreboardExt/Classes/Types.uc b/ScoreboardExt/Classes/Types.uc
index c4f2e99..2575ea7 100644
--- a/ScoreboardExt/Classes/Types.uc
+++ b/ScoreboardExt/Classes/Types.uc
@@ -55,12 +55,22 @@ struct RankRelation
 {
 	var string ObjectID;
 	var int    RankID;
+	
+	StructDefaultProperties
+	{
+		RankID=-999
+	}
 };
 
 struct UIDRankRelation
 {
 	var UniqueNetId UID;
 	var int RankID;
+	
+	StructDefaultProperties
+	{
+		RankID=-999
+	}
 };
 
 struct SCESettingsAdmin