diff --git a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
index 47aea08..0fd9f22 100755
--- a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
+++ b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
@@ -32,18 +32,11 @@ public final class ChatUserManager {
                 return user;
             }
         }
-        // todo move the CompletableFuture to Queries
-        return CompletableFuture.supplyAsync(() -> {
-            ChatUser loadChatUser = Queries.loadChatUser(uuid);
-            if (loadChatUser != null) {
-                ChatUserManager.addUser(loadChatUser);
-            }
-            return loadChatUser;
-        }).join();
-//        if(user == null) user = new ChatUser(uuid, -1, false, false);
-//        Queries.saveUser(user);
-//        chatUsers.add(user);
-//        return user;
+        ChatUser user = Queries.loadChatUser(uuid);
+        if(user == null) user = new ChatUser(uuid, -1, false, false);
+        Queries.saveUser(user);
+        chatUsers.add(user);
+        return user;
     }
 
     public List<Mail> getUnReadMail(ChatUser user) {
diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index a7479c9..f96dd5f 100755
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -42,6 +42,7 @@ public class ChatPlugin extends JavaPlugin {
         registerCommand("ignore", new Ignore());
         registerCommand("unignore", new Unignore());
         registerCommand("muteserver", new MuteServer());
+        registerCommand("spy", new Spy());
 
         messageChannel = Config.MESSAGECHANNEL;
         getServer().getMessenger().registerOutgoingPluginChannel(this, messageChannel);