diff --git a/pom.xml b/pom.xml
index 48a002a..3eca90d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.glyart.authmevelocity</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.0</version>
+    <version>2.0.0</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 98c2386..630adb5 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.glyart.authmevelocity</groupId>
-        <version>1.5.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java b/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
index 5006c2b..6cb963f 100644
--- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
+++ b/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
@@ -2,7 +2,6 @@ package com.glyart.authmevelocity.proxy.listener;
 
 import java.util.Optional;
 
-import com.glyart.authmevelocity.proxy.AuthMeVelocityPlugin;
 import com.glyart.authmevelocity.proxy.AuthmeVelocityAPI;
 import com.glyart.authmevelocity.proxy.config.AuthMeConfig;
 import com.glyart.authmevelocity.proxy.config.ConfigUtils;
@@ -39,8 +38,8 @@ public final class ProxyListener {
     }
 
     @Subscribe
-    public void onDisconnect(final DisconnectEvent event) {
-        api.removePlayer(event.getPlayer());
+    public EventTask onDisconnect(final DisconnectEvent event) {
+        return EventTask.async(() -> api.removePlayer(event.getPlayer()));
     }
 
     @Subscribe(order = PostOrder.FIRST)
@@ -94,10 +93,11 @@ public final class ProxyListener {
 
     @Subscribe(order = PostOrder.FIRST)
     public EventTask onTabComplete(TabCompleteEvent event){
-        if (!api.isLogged(event.getPlayer())){
-            return EventTask.async(() -> event.getSuggestions().clear());
-        }
-        return null;
+        return EventTask.async(() -> {
+            if (!api.isLogged(event.getPlayer())){
+                event.getSuggestions().clear();
+            }
+        });
     }
 
     @Subscribe(order = PostOrder.LATE)
@@ -111,7 +111,7 @@ public final class ProxyListener {
             continuation.resume();
             return;
         }
-        RegisteredServer server = getAvailableServer();
+        @Nullable RegisteredServer server = getAvailableServer();
         if(server == null) {
             continuation.resume();
             logger.error("Cannot send the player {} to an auth server", event.getPlayer().getUsername());
diff --git a/spigot/pom.xml b/spigot/pom.xml
index a45166c..e12f54e 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.glyart.authmevelocity</groupId>
-        <version>1.5.0</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>