diff --git a/src/main/java/fr/xephi/authme/api/NewAPI.java b/src/main/java/fr/xephi/authme/api/NewAPI.java
index d3a0b7d8..b359b270 100644
--- a/src/main/java/fr/xephi/authme/api/NewAPI.java
+++ b/src/main/java/fr/xephi/authme/api/NewAPI.java
@@ -99,7 +99,7 @@ public class NewAPI {
      * @return true if the player is an npc
      */
     public boolean isNPC(Player player) {
-        return Utils.isNPC(player);
+        return plugin.getPluginHooks().isNpc(player);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index fb44b4c3..68f72d60 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -451,14 +451,19 @@ public class AuthMePlayerListener implements Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerInventoryClick(InventoryClickEvent event) {
-        if (event.getWhoClicked() == null)
+        if (event.getWhoClicked() == null) {
             return;
-        if (!(event.getWhoClicked() instanceof Player))
+        }
+        if (!(event.getWhoClicked() instanceof Player)) {
             return;
-        if (Utils.checkAuth((Player) event.getWhoClicked()))
+        }
+        Player player = (Player) event.getWhoClicked();
+        if (Utils.checkAuth(player)) {
             return;
-        if (Utils.isNPC((Player) event.getWhoClicked()))
+        }
+        if (plugin.getPluginHooks().isNpc(player)) {
             return;
+        }
         event.setCancelled(true);
     }