diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java
index 464d01d..a845ec4 100644
--- a/src/main/java/de/diddiz/LogBlock/Consumer.java
+++ b/src/main/java/de/diddiz/LogBlock/Consumer.java
@@ -670,7 +670,9 @@ public class Consumer extends TimerTask
 
 		@Override
 		public String[] getInserts() {
-			return new String[]{"UPDATE `lb-players` SET lastlogin = FROM_UNIXTIME(" + lastLogin + "), firstlogin = IF(firstlogin = 0, FROM_UNIXTIME(" + lastLogin + "), firstlogin), ip = '" + ip + "', playername = '" + player.getName() + "' WHERE UUID = '" + player.getUUID() + "';"};
+			if (logPlayerInfo)
+				return new String[]{"UPDATE `lb-players` SET lastlogin = FROM_UNIXTIME(" + lastLogin + "), firstlogin = IF(firstlogin = 0, FROM_UNIXTIME(" + lastLogin + "), firstlogin), ip = '" + ip + "', playername = '" + player.getName() + "' WHERE UUID = '" + player.getUUID() + "';"};
+			return new String[]{"UPDATE `lb-players` SET playername = '" + player.getName() + "' WHERE UUID = '" + player.getUUID() + "';"};
 		}
 
 		@Override
@@ -696,7 +698,9 @@ public class Consumer extends TimerTask
 
 		@Override
 		public String[] getInserts() {
-			return new String[]{"UPDATE `lb-players` SET onlinetime = onlinetime + TIMESTAMPDIFF(SECOND, lastlogin, FROM_UNIXTIME('" + leaveTime + "')), playername = '" + actor.getName() + "' WHERE lastlogin > 0 && UUID = '" + actor.getUUID() + "';"};
+			if (logPlayerInfo)
+				return new String[]{"UPDATE `lb-players` SET onlinetime = onlinetime + TIMESTAMPDIFF(SECOND, lastlogin, FROM_UNIXTIME('" + leaveTime + "')), playername = '" + actor.getName() + "' WHERE lastlogin > 0 && UUID = '" + actor.getUUID() + "';"};
+			return new String[]{"UPDATE `lb-players` SET playername = '" + actor.getName() + "' WHERE UUID = '" + actor.getUUID() + "';"};
 		}
 
 		@Override
diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java
index 46b1a3b..f7d8687 100644
--- a/src/main/java/de/diddiz/LogBlock/LogBlock.java
+++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java
@@ -148,6 +148,7 @@ public class LogBlock extends JavaPlugin
 	private void registerEvents() {
 		final PluginManager pm = getPluginManager();
 		pm.registerEvents(new ToolListener(this), this);
+		pm.registerEvents(new PlayerInfoLogging(this), this);
 		if (askRollbackAfterBan)
 			pm.registerEvents(new BanListener(this), this);
 		if (isLogging(Logging.BLOCKPLACE))
@@ -190,8 +191,6 @@ public class LogBlock extends JavaPlugin
 			pm.registerEvents(new BlockSpreadLogging(this), this);
 		if (isLogging(Logging.LOCKEDCHESTDECAY))
 			pm.registerEvents(new LockedChestDecayLogging(this), this);
-		if (logPlayerInfo)
-			pm.registerEvents(new PlayerInfoLogging(this), this);
 	}
 
 	@Override