diff --git a/README.md b/README.md
index dab4130..b79efdf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 This plugin adds the support for [Velocity](https://velocitypowered.com/) to [AuthMeReloaded](https://github.com/AuthMe/AuthMeReloaded)
 
 ## Requirements
-- Paper, Airplane or Purpur
+- Paper, Airplane or Purpur 1.16+
 - Velocity 3.0.1+
 - Java 16
 
diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java b/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java
index f23a3b4..8c13018 100644
--- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java
+++ b/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java
@@ -1,6 +1,5 @@
 package com.glyart.authmevelocity.spigot.events;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
@@ -12,7 +11,7 @@ public class PreSendLoginEvent extends PlayerEvent implements Cancellable {
     private boolean isCancelled;
 
     public PreSendLoginEvent(@NotNull final Player player) {
-        super(player, !Bukkit.isPrimaryThread());
+        super(player);
     }
 
     @Override
diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java b/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java
index afe54f3..251c20e 100644
--- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java
+++ b/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java
@@ -8,9 +8,9 @@ import fr.xephi.authme.events.LoginEvent;
 import fr.xephi.authme.events.LogoutEvent;
 import fr.xephi.authme.events.RegisterEvent;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 public class AuthMeListener implements Listener {
@@ -20,12 +20,11 @@ public class AuthMeListener implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onLogin(final LoginEvent event) {
         final Player player = event.getPlayer();
         PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player);
-        Bukkit.getPluginManager().callEvent(preSendLoginEvent);
-        if(!preSendLoginEvent.isCancelled()){
+        if(!preSendLoginEvent.callEvent()){
             plugin.sendMessageToProxy(player, MessageType.LOGIN);
         }
     }