diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
index 810ef0b33..5d72d0b55 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
@@ -23,11 +23,11 @@ public class Commandlightning extends EssentialsCommand
 		if (sender instanceof Player)
 		{
 			user = ess.getUser(((Player)sender));
-		}
-		if ((args.length < 1 || !user.isAuthorized("essentials.lightning.others")) & user != null)
-		{
-			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
-			return;
+			if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others")))
+			{
+				user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
+				return;
+			}
 		}
 
 		if (server.matchPlayer(args[0]).isEmpty())
@@ -35,7 +35,7 @@ public class Commandlightning extends EssentialsCommand
 			throw new Exception(_("playerNotFound"));
 		}
 
-		int power = 1;
+		int power = 5;
 		if (args.length > 1)
 		{
 			try
@@ -50,18 +50,12 @@ public class Commandlightning extends EssentialsCommand
 		for (Player matchPlayer : server.matchPlayer(args[0]))
 		{
 			sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
-			if (power <= 0)
-			{
-				matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
-			}
-			else
-			{
-				LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation());
-				matchPlayer.damage(power - 1, strike);
-			}
+
+			final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
+			
 			if (!ess.getUser(matchPlayer).isGodModeEnabled())
 			{
-				matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5);
+				matchPlayer.damage(power, strike);
 			}
 			if (ess.getSettings().warnOnSmite())
 			{