diff --git a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java
index 10f435e..37fb806 100644
--- a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java
+++ b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java
@@ -42,7 +42,7 @@ public class JoinmeCommand extends BasicCommand {
 
             if (args.length == 0 && player.hasPermission("bungeecore.joinme")) {
                 Message.broadcast("JOINME_BROADCAST", "JOINME_BROADCAST_HOVER"
-                        , new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName()));
+                        , new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName()), player.getName(), player.getServer().getInfo().getName());
             } else if (args.length == 1) {
                 ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
                 if(target == null || !target.isConnected()){
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 6b85d53..6679b9b 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -232,7 +232,7 @@ JOIN_PLAYER_BLOCK=§cDieser Spieler hat dich geblockt!
 
 #JoinmeCommand
 JOINME_USAGE=§8/§7join §8[§eSpieler§8].
-JOINME_BROADCAST=§7Klicke §ehier§8, §7um zu §e" + player.getName() + " §7auf §e" + player.getServer().getInfo().getName() + " §7zu kommen§8!
+JOINME_BROADCAST=§7Klicke §ehier§8, §7um zu §e{0} §7auf §e{1} §7zu kommen§8!
 JOINME_BROADCAST_HOVER=§aSpieler folgen
 JOINME_PLAYER_OFFLINE=§cDieser Spieler ist offline.
 JOINME_PLAYER_SELF=§cSei eins mit dir selbst!