diff --git a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/commands/CommandServerUtils.java b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/commands/CommandServerUtils.java
index e3df448..d44446c 100644
--- a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/commands/CommandServerUtils.java
+++ b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/commands/CommandServerUtils.java
@@ -260,7 +260,7 @@ public class CommandServerUtils extends BaseCommand {
         FormatBuilder builder = FormatBuilder.create(format)
                 .orderedKeys("%key%", "%value%")
                 .add("Name", node.getName())
-                .add("Plugin", "<UNKNOWN>"); // TODO: fix plugin command
+                .add("Plugin", plugin.getPluginCommandManager().findPluginId(command).orElse("<UNKNOWN>"));
 
         builder.sendTo(sender);
         Messenger.sendMessage(sender, "serverutils.commandinfo.footer");
diff --git a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginCommandManager.java b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginCommandManager.java
index 2c4aeb0..dafbcb5 100644
--- a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginCommandManager.java
+++ b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginCommandManager.java
@@ -12,6 +12,7 @@ import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
 
 public class VelocityPluginCommandManager {
 
@@ -41,6 +42,18 @@ public class VelocityPluginCommandManager {
         return manager;
     }
 
+    /**
+     * Attempts to find the plugin id for a given command alias.
+     */
+    public Optional<String> findPluginId(String alias) {
+        for (Map.Entry<String, String> entry : pluginCommands.entries()) {
+            if (alias.equals(entry.getValue())) {
+                return Optional.of(entry.getKey());
+            }
+        }
+        return Optional.empty();
+    }
+
     public Multimap<String, String> getPluginCommands() {
         return pluginCommands;
     }