diff --git a/ReallifeGamemode.Client/Gui/playerlist.ts b/ReallifeGamemode.Client/Gui/playerlist.ts
index 743b4654..f1b5f6b6 100644
--- a/ReallifeGamemode.Client/Gui/playerlist.ts
+++ b/ReallifeGamemode.Client/Gui/playerlist.ts
@@ -11,7 +11,7 @@ export default function playerList(globalData: GlobalData): void {
 
     mp.events.add("showPlayerlist", (playersJson) => {
         
-        if (playerlistBrowser === null) {
+        if (playerlistBrowser !== null) {
             playerlistBrowser.destroy()
             playerlistBrowser = null;
             globalData.InInput = false;
diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index d6665143..00658252 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Commands
 
       using (var dbContext = new DatabaseContext())
       {
-        FactionRank fr = dbContext.FactionRanks.FirstOrDefault(r => r.RankName == rank && r.FactionId == player.GetUser(dbContext).FactionId);
+        FactionRank fr = dbContext.FactionRanks.FirstOrDefault(r => r.Order == int.Parse(rank) && r.FactionId == player.GetUser(dbContext).FactionId);
         if (fr == null)
         {
           ChatService.ErrorMessage(player, "Dieser Rang existiert nicht");
@@ -108,8 +108,8 @@ namespace ReallifeGamemode.Server.Commands
 
         target.GetUser(dbContext).FactionRankId = fr.Id;
 
-        ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " den Rang '" + fr.RankName + "' gegeben.");
-        ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " den Rang '" + fr.RankName + "' erhalten.");
+        ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " den Rang '" + fr.Order + "(" + fr.RankName +  ")' gegeben.");
+        ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " den Rang '" + fr.Order + "(" + fr.RankName + ")' erhalten.");
 
         dbContext.SaveChanges();
       }
diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
index 4ef7ff07..b428052e 100644
--- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
@@ -107,7 +107,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
           user.TriggerEvent("stopTimer");
           CheckPointHandle.StartCheckPointRoute(user, planeRoute, 0, 6, 12, "planeSchoolEvent");
         }
-         
       }
     }