diff --git a/src/main/java/emu/grasscutter/command/CommandMap.java b/src/main/java/emu/grasscutter/command/CommandMap.java
index 852481187ae..4806df751e8 100644
--- a/src/main/java/emu/grasscutter/command/CommandMap.java
+++ b/src/main/java/emu/grasscutter/command/CommandMap.java
@@ -4,8 +4,12 @@
 import emu.grasscutter.game.player.Player;
 import org.reflections.Reflections;
 
+import java.net.IDN;
 import java.util.*;
 
+import static emu.grasscutter.config.Configuration.ACCOUNT;
+import static emu.grasscutter.config.Configuration.SERVER;
+
 @SuppressWarnings({"UnusedReturnValue", "unused"})
 public final class CommandMap {
     private final Map<String, CommandHandler> commands = new TreeMap<>();
@@ -164,9 +168,9 @@ private Player getTargetPlayer(String playerId, Player player, Player targetPlay
 
     private boolean setPlayerTarget(String playerId, Player player, String targetUid) {
         if (targetUid.equals("")) { // Clears the default targetPlayer.
-                targetPlayerIds.remove(playerId);
-                CommandHandler.sendTranslatedMessage(player, "commands.execution.clear_target");
-                return true;
+            targetPlayerIds.remove(playerId);
+            CommandHandler.sendTranslatedMessage(player, "commands.execution.clear_target");
+            return true;
         }
 
         // Sets default targetPlayer to the UID provided.
@@ -195,6 +199,15 @@ private boolean setPlayerTarget(String playerId, Player player, String targetUid
      * @param rawMessage The messaged used to invoke the command.
      */
     public void invoke(Player player, Player targetPlayer, String rawMessage) {
+        // The console outputs in-game command. [{Account Username} (Player UID: {Player Uid})]
+        if (SERVER.logCommands) {
+            if (player != null) {
+                Grasscutter.getLogger().info("Command used by [" + player.getAccount().getUsername() + " (Player UID: " + player.getUid() + ")]: " + rawMessage);
+            } else {
+                Grasscutter.getLogger().info("Command used by server console: " + rawMessage);
+            }
+        }
+        
         rawMessage = rawMessage.trim();
         if (rawMessage.length() == 0) {
             CommandHandler.sendTranslatedMessage(player, "commands.generic.not_specified");
@@ -218,7 +231,7 @@ public void invoke(Player player, Player targetPlayer, String rawMessage) {
                     targetUidStr = targetUidStr.substring(1);
                 }
                 this.setPlayerTarget(playerId, player, targetUidStr);
-            return;
+                return;
             } else {
                 this.setPlayerTarget(playerId, player, "");
                 return;
diff --git a/src/main/java/emu/grasscutter/config/ConfigContainer.java b/src/main/java/emu/grasscutter/config/ConfigContainer.java
index 6a52027b6ac..fa84e6a9533 100644
--- a/src/main/java/emu/grasscutter/config/ConfigContainer.java
+++ b/src/main/java/emu/grasscutter/config/ConfigContainer.java
@@ -95,7 +95,8 @@ public static class Server {
         public Set<Integer> debugWhitelist = Set.of();
         public Set<Integer> debugBlacklist = Set.of();
         public ServerRunMode runMode = ServerRunMode.HYBRID;
-
+        public boolean logCommands = false;
+        
         public HTTP http = new HTTP();
         public Game game = new Game();