diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index 653068420..fe7cd49f0 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -169,6 +169,9 @@ public class EssentialsEntityListener implements Listener
 	{
 		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
+			final Player player = (Player)event.getEntity();
+			player.setFoodLevel(20);
+			player.setSaturation(10);
 			event.setCancelled(true);
 		}
 	}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
index 5ca2aad9a..2e27fa192 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
@@ -66,6 +66,7 @@ public class Commandgod extends EssentialsCommand
 			final boolean enabled = player.isGodModeEnabled();
 			if (enabled)
 			{
+				player.setHealth(player.getMaxHealth());
 				player.setFoodLevel(20);
 			}