diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index cc819f0db..bfe2e8904 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -388,7 +388,7 @@ public class AuthMePlayerListener implements Listener {
 
         if (!lowname.equals(name)) {
             // Little workaround to be sure registered player is the same as this
-            if (player.hasPlayedBefore())
+            if (player.hasPlayedBefore() && !player.isOnline())
                 // Make sure it's the correct player
                 if (data.isAuthAvailable(lowname))
                     if (data.getAuth(lowname).getIp().equalsIgnoreCase(player.getAddress().getAddress().getHostAddress()))