diff --git a/src/main/java/org/ultramine/commands/CommandRegistry.java b/src/main/java/org/ultramine/commands/CommandRegistry.java
index c7b73c6..22848b6 100644
--- a/src/main/java/org/ultramine/commands/CommandRegistry.java
+++ b/src/main/java/org/ultramine/commands/CommandRegistry.java
@@ -7,6 +7,9 @@
 import org.ultramine.commands.syntax.ArgumentsPatternParser;
 import org.ultramine.server.util.TranslitTable;
 
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.ModContainer;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -46,7 +49,8 @@
 
 	public IExtendedCommand registerVanillaCommand(ICommand command)
 	{
-		return registerCommand(new VanillaCommandWrapper(command));
+		ModContainer active = Loader.instance().activeModContainer();
+		return registerCommand(new VanillaCommandWrapper(command, active != null ? active.getModId().toLowerCase() : "vanilla"));
 	}
 
 	public void registerCommands(Class<?> cls)
diff --git a/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java b/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java
index e09c945..5c4b503 100644
--- a/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java
+++ b/src/main/java/org/ultramine/commands/VanillaCommandWrapper.java
@@ -9,15 +9,17 @@
 
 public class VanillaCommandWrapper implements IExtendedCommand
 {
-	private ICommand wrappedCommand;
-	private String permission;
-	private String description;
+	private final ICommand wrappedCommand;
+	private final String permission;
+	private final String description;
+	private final String group;
 
-	public VanillaCommandWrapper(ICommand wrappedCommand)
+	public VanillaCommandWrapper(ICommand wrappedCommand, String group)
 	{
 		this.wrappedCommand = wrappedCommand;
-		this.permission = "command.vanilla." + wrappedCommand.getCommandName();
-		this.description = "command." + wrappedCommand.getCommandName() + ".description";
+		this.group = group;
+		this.permission = "command." + group + "." + wrappedCommand.getCommandName();
+		this.description = "command." + wrappedCommand.getCommandName().toLowerCase() + ".description";
 	}
 
 	@Override
@@ -85,6 +87,6 @@
 	@Override
 	public String getGroup()
 	{
-		return "vanilla";
+		return group;
 	}
 }