diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
index 4bbc38941..cc473e105 100644
--- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -508,7 +508,8 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.NORMAL)
 	public void onPlayerInteract(final PlayerInteractEvent event)
 	{
-		final IUser user = userMap.getUser(event.getPlayer());
+		Player player = event.getPlayer();
+		final IUser user = userMap.getUser(player);
 		user.updateActivity(true);
 		switch (event.getAction())
 		{
@@ -519,9 +520,10 @@ public class EssentialsPlayerListener implements Listener
 			}
 
 			final ISettings settings = ess.getSettings();
-			if (settings.getData().getCommands().getHome().isUpdateBedAtDaytime() && event.getClickedBlock().getType() == Material.BED_BLOCK)
+			if (settings.getData().getCommands().getHome().isUpdateBedAtDaytime() && event.getClickedBlock().getType() == Material.BED_BLOCK && Permissions.BED_SETHOME.isAuthorized(player))
 			{
-				event.getPlayer().setBedSpawnLocation(event.getClickedBlock().getLocation());
+				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
+				player.sendMessage(_("§6Home set."));
 			}
 			break;
 		case LEFT_CLICK_AIR:
diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java
index 100c05127..8a1ddb546 100644
--- a/Essentials/src/net/ess3/permissions/Permissions.java
+++ b/Essentials/src/net/ess3/permissions/Permissions.java
@@ -21,6 +21,7 @@ public enum Permissions implements IPermission
 	BAN_EXEMPT,
 	BAN_NOTIFY,
 	BAN_OFFLINE,
+	BED_SETHOME,
 	BOOK_AUTHOR,
 	BOOK_OTHERS,
 	BOOK_TITLE,