diff --git a/src/main/java/fr/xephi/authme/util/PlayerUtils.java b/src/main/java/fr/xephi/authme/util/PlayerUtils.java
index 04216933c..800993e81 100644
--- a/src/main/java/fr/xephi/authme/util/PlayerUtils.java
+++ b/src/main/java/fr/xephi/authme/util/PlayerUtils.java
@@ -28,7 +28,7 @@ public static String getPlayerIp(Player player) {
      * @return True if the player is an NPC, false otherwise
      */
     public static boolean isNpc(Player player) {
-        return player.hasMetadata("NPC");
+        return player.hasMetadata("NPC") || player.getAddress() == null;
     }
 
 }