diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 4cf45b916..d369a704d 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -484,6 +484,7 @@ newbies:
   announce-format: '&dWelcome {DISPLAYNAME} to the server!'
   
   # When we spawn for the first time, which spawnpoint do we use?
+  # Set to "none" if you want to use the spawn point of the world.
   spawnpoint: newbies
 
 # End of File <-- No seriously, you're done with configuration.
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index f7395b49f..3c85c3661 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -59,20 +59,23 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
 			return;
 		}
 		user.setNew(false);
-		ess.scheduleSyncDelayedTask(new Runnable()
+		if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn()))
 		{
-			public void run()
+			ess.scheduleSyncDelayedTask(new Runnable()
 			{
-				try
+				public void run()
 				{
-					user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()));
+					try
+					{
+						user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()));
+					}
+					catch (Exception ex)
+					{
+						Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex);
+					}
 				}
-				catch (Exception ex)
-				{
-					Logger.getLogger("Minecraft").log(Level.WARNING, Util.i18n("teleportNewPlayerError"), ex);
-				}
-			}
-		});
+			});
+		}
 
 		if (ess.getSettings().getAnnounceNewPlayers())
 		{