diff --git a/src/de/steamwar/bungeecore/EventStarter.java b/src/de/steamwar/bungeecore/EventStarter.java
index 058f372a..c81b0e79 100644
--- a/src/de/steamwar/bungeecore/EventStarter.java
+++ b/src/de/steamwar/bungeecore/EventStarter.java
@@ -4,6 +4,7 @@ import de.steamwar.bungeecore.sql.EventFight;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.bungeecore.sql.Team;
 import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 
@@ -49,7 +50,9 @@ public class EventStarter implements Runnable {
 
             eventServer.put(blue, subserver);
             eventServer.put(red, subserver);
-            BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + "§7Hier §eklicken §7für den Kampf §e" + blue.getTeamName() + " §8vs §e" + red.getTeamName());
+            BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + "§7Hier §eklicken §7für den Kampf §e" + blue.getTeamName() + " §8vs §e" + red.getTeamName(),
+                    "§eEvent beitreten",
+                    new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/event " + blue.getTeamKuerzel()));
         }
     }
 
diff --git a/src/de/steamwar/bungeecore/sql/SteamwarUser.java b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
index 5698d625..c65ab7f6 100644
--- a/src/de/steamwar/bungeecore/sql/SteamwarUser.java
+++ b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
@@ -53,7 +53,7 @@ public class SteamwarUser {
         if(user != null){
             String userName = SQL.disarmString(connection.getName());
             if(!user.userName.equals(userName)){
-                SQL.update("UPDATE UserData SET UserName = '" + userName + "'");
+                SQL.update("UPDATE UserData SET UserName = '" + userName + "' WHERE id = " + user.id);
                 user.userName = userName;
             }
         }else{