diff --git a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerJoinListener.java b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerJoinListener.java
index 00ded8b..0fb21c0 100644
--- a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerJoinListener.java
+++ b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerJoinListener.java
@@ -49,7 +49,7 @@ public void onJoin(PlayerJoinEvent event) {
     }
 
     //We don't manage so send the player to the spawn world
-    if(!event.getPlayer().hasPlayedBefore()) {
+    if(!event.getPlayer().hasPlayedBefore() && PhantomWorlds.instance().settings.getConfig().getBoolean("spawning.default-first", true)) {
       event.getPlayer().teleport(Utils.parseSpawn(sWorld));
     }
   }
diff --git a/src/main/java/me/lokka30/phantomworlds/managers/FileManager.java b/src/main/java/me/lokka30/phantomworlds/managers/FileManager.java
index 63d3330..ecdf5f8 100644
--- a/src/main/java/me/lokka30/phantomworlds/managers/FileManager.java
+++ b/src/main/java/me/lokka30/phantomworlds/managers/FileManager.java
@@ -159,7 +159,7 @@ void alertIncorrectVersion(final PWFile pwFile) {
    * @since v2.0.0
    */
   public enum PWFile {
-    SETTINGS(2),
+    SETTINGS(3),
     ADVANCED_SETTINGS(1),
     MESSAGES(9),
     DATA(2);
diff --git a/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java b/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java
new file mode 100644
index 0000000..d552ae3
--- /dev/null
+++ b/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java
@@ -0,0 +1,27 @@
+package me.lokka30.phantomworlds.misc;
+/*
+ * Phantom Worlds
+ * Copyright (C) 2023 - 2024 Daniel "creatorfromhell" Vidmar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * PAPIHook
+ *
+ * @author creatorfromhell
+ * @since 2.0.5.0
+ */
+public class PAPIHook {
+}
\ No newline at end of file
diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml
index 4b4c510..6779ab5 100644
--- a/src/main/resources/settings.yml
+++ b/src/main/resources/settings.yml
@@ -14,6 +14,9 @@ spawning:
   #they will go to.
   default-world: world
 
+  #If players should be sent to the default-world if they haven't played before.
+  default-first: true
+
   #Should players respawn at the world spawn if they don't have a bed?
   respawn-world: true
 
@@ -31,5 +34,5 @@ backup-delay: 600
 
 # Do not touch anything here unless you know what you are doing.
 advanced:
-  file-version: 2
+  file-version: 3
   generated-with: '${project.version}'
\ No newline at end of file