diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
index 3f2755677..c9b02d68e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
@@ -113,12 +113,14 @@ public class Commandtime extends EssentialsCommand {
      */
     private Set<World> getWorlds(final Server server, final CommandSource sender, final String selector) throws Exception {
         final Set<World> worlds = new TreeSet<>(new WorldNameComparator());
+        User user = ess.getUser(sender.getPlayer());
 
         // If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user.
         if (selector == null) {
             if (sender.isPlayer()) {
-
-                final User user = ess.getUser(sender.getPlayer());
+                if (!user.isAuthorized("essentials.time.set." + normalizeWorldName(user.getWorld()))) {
+                    throw new Exception(tl("timeSetWorldPermission", user.getWorld().getName()));
+                }
                 worlds.add(user.getWorld());
             } else {
                 worlds.addAll(server.getWorlds());
@@ -129,11 +131,30 @@ public class Commandtime extends EssentialsCommand {
         // Try to find the world with name = selector
         final World world = server.getWorld(selector);
         if (world != null) {
+            if (user != null && !user.isAuthorized("essentials.time.set." + normalizeWorldName(world))) {
+                throw new Exception(tl("timeSetWorldPermission", world.getName()));
+            }
             worlds.add(world);
         }
         // If that fails, Is the argument something like "*" or "all"?
         else if (selector.equalsIgnoreCase("*") || selector.equalsIgnoreCase("all")) {
-            worlds.addAll(server.getWorlds());
+            // Add all worlds by default if the sender is console or player has the permission.
+            if (user == null || user.isAuthorized("essentials.time.set.all")) {
+                worlds.addAll(server.getWorlds());
+            } else {
+                // They don't have the _all_ permission, add worlds that they have permission for.
+                for (World world1 : server.getWorlds()) {
+                    if (user.isAuthorized("essentials.time.set." + normalizeWorldName(world1))) {
+                        worlds.add(world1);
+                    }
+                }
+
+                // Notify the player if they don't have permission for setting time on all worlds.
+                if (worlds.isEmpty()) {
+                    throw new Exception(tl("timeSetAllPermission"));
+                }
+            }
+
         }
         // We failed to understand the world target...
         else {
@@ -142,6 +163,10 @@ public class Commandtime extends EssentialsCommand {
 
         return worlds;
     }
+
+    private String normalizeWorldName(World world) {
+        return world.getName().replaceAll("\\s+", "_");
+    }
 }
 
 
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 4f9ec6307..6528230bc 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -437,6 +437,8 @@ timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.
 timeBeforeTeleport=\u00a74Time before next teleport\:\u00a7c {0}\u00a76.
 timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76
 timeSetPermission=\u00a74You are not authorized to set the time.
+timeSetAllPermission=\u00a74You are not authorized to set the time in all worlds.
+timeSetWorldPermission=\u00a74You are not authorized to set the time in world ''{0}''.
 timeWorldCurrent=\u00a76The current time in\u00a7c {0} \u00a76is \u00a7c{1}\u00a76.
 timeWorldSet=\u00a76The time was set to\u00a7c {0} \u00a76in\: \u00a7c{1}\u00a76.
 totalWorthAll=\u00a7aSold all items and blocks for a total worth of \u00a7c{1}\u00a7a.