diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
index cc114eeb2..c5ba0b727 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
@@ -467,7 +467,13 @@ public class PlotMain extends JavaPlugin {
                     DatabaseMetaData meta = connection.getMetaData();
                     ResultSet res = meta.getTables(null, null, "plot", null);
                     if (!res.next()) {
-                        DBFunc.createTables("mysql");
+                        DBFunc.createTables("mysql",true);
+                    }
+                    else {
+                        res = meta.getTables(null, null, "plot_trusted", null);
+                        if (!res.next()) {
+                            DBFunc.createTables("mysql",false);
+                        }
                     }
                 }
             } catch (ClassNotFoundException | SQLException e) {
@@ -489,7 +495,7 @@ public class PlotMain extends JavaPlugin {
                     DatabaseMetaData meta = connection.getMetaData();
                     ResultSet res = meta.getTables(null, null, "plot", null);
                     if (!res.next()) {
-                        DBFunc.createTables("sqlite");
+                        DBFunc.createTables("sqlite", true);
                     }
                 }
             } catch (ClassNotFoundException | SQLException e) {
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java
index a08e3764a..180202a3b 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java
@@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.PlotMain;
  */
 public class MainCommand implements CommandExecutor {
 
-    private static SubCommand[] _subCommands = new SubCommand[] { new Claim(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Reload(), new Merge(), new Unlink(), new Kick() };
+    private static SubCommand[] _subCommands = new SubCommand[] { new Claim(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Trusted(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Reload(), new Merge(), new Unlink(), new Kick() };
 
     public static ArrayList<SubCommand> subCommands = new ArrayList<SubCommand>() {
         {
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
index 3dd2ebfce..cd6ff6048 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
@@ -140,7 +140,7 @@ public class Unlink extends SubCommand {
             
         }
         
-        PlayerFunctions.sendMessage(plr, "&cPLOT UNLINKING IS NOT FINISHED (as you can see by the lack of roads appearing)");
+        PlayerFunctions.sendMessage(plr, "&6Plots unlinked successfully!");
         return true;
     }
     /**
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java b/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
index 259674cb6..75bd06172 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
@@ -91,7 +91,7 @@ public class DBFunc {
      * 
      * @throws SQLException
      */
-    public static void createTables(String database) throws SQLException {
+    public static void createTables(String database, boolean add_constraint) throws SQLException {
         boolean mysql = database.equals("mysql");
 
         Statement stmt = connection.createStatement();
@@ -102,7 +102,9 @@ public class DBFunc {
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot_helpers` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot_trusted` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot_settings` (" + "  `plot_plot_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0'," + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL," + "  `merged` INT(11) DEFAULT NULL," + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + "  PRIMARY KEY (`plot_plot_id`)," + "  UNIQUE KEY `unique_alias` (`alias`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("ALTER TABLE `plot_settings` ADD CONSTRAINT `plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `plot` (`id`) ON DELETE CASCADE");
+            if (add_constraint) {
+                stmt.addBatch("ALTER TABLE `plot_settings` ADD CONSTRAINT `plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `plot` (`id`) ON DELETE CASCADE");
+            }
 
         } else {
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot` (" + "`id` INTEGER(11) PRIMARY KEY," + "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");