diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index 2b7ec0d1..8268ebfd 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -676,8 +676,8 @@ ARENA_NOT_FOUND=§cThe specified arena could not be found
 
 #Rank
 RANK_PLAYER_NOT_FOUND=§cPlayer not found
-RANK_PLAYER_FOUND=§eRank §7of §e{0}
-RANK_HEADER=§eRank Season {0}
+RANK_PLAYER_SELF=§eRank §7Season §e{0}
+RANK_PLAYER_FOUND=§eRank §7of §e{0} §7Season §e{1}
 RANK_DATA={0} §e{1} {2}
 RANK_UNPLACED=§7unranked
 RANK_PLACED=§e{0}§8. §7with §e{1} §7Elo§8.
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
index 1e901782..38c7bc3a 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
@@ -643,8 +643,8 @@ ARENA_NOT_FOUND=§cDie angegebene Arena konnte nicht gefunden werden
 
 #Rank
 RANK_PLAYER_NOT_FOUND=§cSpieler nicht gefunden
-RANK_PLAYER_FOUND=§eRang §7von §e{0}
-RANK_HEADER=§eRang Saison {0}
+RANK_PLAYER_SELF=§eRang §7Saison §e{0}
+RANK_PLAYER_FOUND=§eRang §7von §e{0} §7Saison §e{1}
 RANK_DATA={0} §e{1} {2}
 RANK_UNPLACED=§7unplatziert
 RANK_PLACED=§e{0}§8. §7mit §e{1} §7Elo§8.
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
index 92579cb4..fc96c478 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -20,10 +20,10 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.Season;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserElo;
@@ -43,9 +43,11 @@ public class RankCommand extends SWCommand {
 
     @Register
     public void rank(Chatter sender, @ErrorMessage("RANK_PLAYER_NOT_FOUND") SteamwarUser user) {
-        sender.prefixless("RANK_HEADER", Season.convertSeasonToString(Season.getSeason()));
-        if (!sender.user().equals(user))
-            sender.prefixless("RANK_PLAYER_FOUND", user);
+        if (!sender.user().equals(user)) {
+            sender.prefixless("RANK_PLAYER_FOUND", user, Season.convertSeasonToString(Season.getSeason()));
+        } else {
+            sender.prefixless("RANK_PLAYER_SELF", Season.convertSeasonToString(Season.getSeason()));
+        }
 
         for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()) {
             if (!mode.Server.Ranked)