diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index 708e53586..54452a600 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -20,12 +20,7 @@ public class Commandrepair extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		if (args[0].equalsIgnoreCase("hand"))
+		if (args.length < 1 || args[0].equalsIgnoreCase("hand") || !user.isAuthorized("essentials.repair.all"))
 		{
 			final ItemStack item = user.getItemInHand();
 			if (item == null || item.getType().isBlock() || item.getDurability() == 0)
@@ -72,7 +67,6 @@ public class Commandrepair extends EssentialsCommand
 				user.sendMessage(_("repair", Util.joinList(repaired)));
 			}
 			charge.charge(user);
-
 		}
 		else
 		{
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 0a164234d..c315098c2 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -303,8 +303,8 @@ commands:
     usage: /<command> <drops|arrows|boats|minecarts|xp|paintings> [radius] [world]
     aliases: [eremove]
   repair:
-    description: Repairs the durability of all or one item.
-    usage: /<command> <hand|all>
+    description: Repairs the durability of one or all items.
+    usage: /<command> [hand|all]
     aliases: [fix,efix,erepair]
   rules:
     description: Views the server rules.