diff --git a/core/src/main/java/com/boydti/fawe/config/Settings.java b/core/src/main/java/com/boydti/fawe/config/Settings.java
index 14d6b0e3..e07473ae 100644
--- a/core/src/main/java/com/boydti/fawe/config/Settings.java
+++ b/core/src/main/java/com/boydti/fawe/config/Settings.java
@@ -70,6 +70,8 @@ public class Settings extends Config {
     public static final class PATHS {
         public String HISTORY = "history";
         public String CLIPBOARD = "clipboard";
+        @Comment("Each player has their own sub directory for schematics")
+        public boolean PER_PLAYER_SCHEMATICS = true;
     }
 
 
diff --git a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
index 6394db85..8070a9cf 100644
--- a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
+++ b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
@@ -265,7 +265,8 @@ public class BrushCommands {
                             BBC.NO_PERM.send(player, "worldedit.schematic.load.other");
                             return;
                         }
-                        File dir = new File(this.worldEdit.getWorkingDirectoryFile(config.saveDir), player.getUniqueId() + File.separator + filename);
+                        File working = this.worldEdit.getWorkingDirectoryFile(config.saveDir);
+                        File dir = new File(working, (Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? (player.getUniqueId().toString() + File.separator) : "") + filename);
                         if (!dir.exists()) {
                             if (!filename.contains("/") && !filename.contains("\\")) {
                                 dir = new File(this.worldEdit.getWorkingDirectoryFile(config.saveDir), filename);
diff --git a/core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
index 73326cc0..c4338d09 100644
--- a/core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -119,7 +119,8 @@ public class SchematicCommands {
                     BBC.NO_PERM.send(player, "worldedit.schematic.load.other");
                     return;
                 }
-                File dir = new File(this.worldEdit.getWorkingDirectoryFile(config.saveDir), player.getUniqueId().toString());
+                File working = this.worldEdit.getWorkingDirectoryFile(config.saveDir);
+                File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, player.getUniqueId().toString()) : working;
                 File f = this.worldEdit.getSafeSaveFile(player, dir, filename, format.getExtension(), format.getExtension());
                 if (f.getName().replaceAll("." + format.getExtension(), "").isEmpty()) {
                     File directory = f.getParentFile();
@@ -187,7 +188,8 @@ public class SchematicCommands {
             BBC.NO_PERM.send(player, "worldedit.schematic.save.other");
             return;
         }
-        final File dir = new File(this.worldEdit.getWorkingDirectoryFile(config.saveDir), player.getUniqueId().toString());
+        File working = this.worldEdit.getWorkingDirectoryFile(config.saveDir);
+        File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, player.getUniqueId().toString()) : working;
         File f = this.worldEdit.getSafeSaveFile(player, dir, filename, format.getExtension(), format.getExtension());
         if (f.getName().replaceAll("." + format.getExtension(), "").isEmpty()) {
             File directory = f.getParentFile();