diff --git a/src/de/steamwar/lobby/map/CustomMapCommand.java b/src/de/steamwar/lobby/map/CustomMapCommand.java
index 9d76bed..2bb13e2 100644
--- a/src/de/steamwar/lobby/map/CustomMapCommand.java
+++ b/src/de/steamwar/lobby/map/CustomMapCommand.java
@@ -41,7 +41,7 @@ public class CustomMapCommand extends SWCommand {
     @Register
     @SneakyThrows
     public void render(@Validator Player p, File file) {
-        if (SteamwarUser.get(p).getUserGroup() != UserGroup.Developer) {
+        if (SteamwarUser.get(p.getUniqueId()).getUserGroup() != UserGroup.Developer) {
             return;
         }
         if (!file.exists()) {
@@ -54,7 +54,7 @@ public class CustomMapCommand extends SWCommand {
     @ClassValidator(value = Player.class, local = true)
     public TypeValidator<Player> getGuardChecker() {
         return (commandSender, player, messageSender) -> {
-            return SteamwarUser.get(player).getUserGroup() == UserGroup.Developer;
+            return SteamwarUser.get(player.getUniqueId()).getUserGroup() == UserGroup.Developer;
         };
     }
 
diff --git a/src/de/steamwar/lobby/portal/CommandPortal.java b/src/de/steamwar/lobby/portal/CommandPortal.java
index 64552dd..1362aa6 100644
--- a/src/de/steamwar/lobby/portal/CommandPortal.java
+++ b/src/de/steamwar/lobby/portal/CommandPortal.java
@@ -84,7 +84,7 @@ public class CommandPortal implements PortalHandler {
 
         if(ModifyCommand.modifying(player))
             player.sendMessage("/" + cmd);
-        NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player).getId(), cmd.toString()));
+        NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player.getUniqueId()).getId(), cmd.toString()));
     }
 
     @Override