diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index f351019bc..df2f7f954 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -6,6 +6,7 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
+import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
 import org.bukkit.entity.CreatureType;
 
 
@@ -19,12 +20,12 @@ public class Commandspawner extends EssentialsCommand
 	@Override
 	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length < 1)
+		if (args.length < 1 || args[0].length() < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		Block target = user.getTarget().getTargetBlock();
+		final Block target = user.getTarget().getTargetBlock();
 		if (target.getType() != Material.MOB_SPAWNER)
 		{
 			throw new Exception(Util.i18n("mobSpawnTarget"));
@@ -33,7 +34,8 @@ public class Commandspawner extends EssentialsCommand
 		charge(user);
 		try
 		{
-			((CreatureSpawner)target).setCreatureType(CreatureType.fromName(args[0]));
+			final String name = args[0].substring(0, 1).toUpperCase() +  args[0].substring(1).toLowerCase();
+			new CraftCreatureSpawner(target).setCreatureType(CreatureType.fromName(name));
 		}
 		catch (Throwable ex)
 		{