diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/BossNetherPortal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/BossNetherPortal.java
index 63f6045c5..3c44bcb40 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/BossNetherPortal.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/BossNetherPortal.java
@@ -250,7 +250,6 @@ public class BossNetherPortal implements Listener
 						{
 							ClansManager.getInstance().getNetherManager().InNether.put((Player)event.getEntity(), Expire);
 							Location from = event.getEntity().getLocation();
-							ClansManager.getInstance().getNetherManager().OverworldOrigins.put((Player)event.getEntity(), from);
 							event.getEntity().teleport(ClansManager.getInstance().getNetherManager().getNetherWorld().getSpawnLocation());
 							ClansManager.getInstance().ClanTips.displayTip(TipType.ENTER_NETHER, (Player)event.getEntity());
 						}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherManager.java
index 0c5c39fa7..0fb01e99e 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherManager.java
@@ -155,7 +155,7 @@ public class NetherManager extends MiniPlugin
 	 */
 	public Location getReturnLocation(Player player)
 	{
-		return OverworldOrigins.getOrDefault(player, Spawn.getNorthSpawn());
+		return OverworldOrigins.getOrDefault(player, Spawn.getWestTown());
 	}
 	
 	/**
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherPortal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherPortal.java
index ff220fc7a..828bc2274 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherPortal.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherPortal.java
@@ -261,7 +261,6 @@ public class NetherPortal implements Listener
 						{
 							ClansManager.getInstance().getNetherManager().InNether.put((Player)event.getEntity(), Expire);
 							Location from = event.getEntity().getLocation();
-							ClansManager.getInstance().getNetherManager().OverworldOrigins.put((Player)event.getEntity(), from);
 							event.getEntity().teleport(ClansManager.getInstance().getNetherManager().getNetherWorld().getSpawnLocation());
 							ClansManager.getInstance().ClanTips.displayTip(TipType.ENTER_NETHER, (Player)event.getEntity());
 						}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/command/ForceTeleportCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/command/ForceTeleportCommand.java
index 18ce12cc1..e798412a0 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/command/ForceTeleportCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/command/ForceTeleportCommand.java
@@ -54,7 +54,6 @@ public class ForceTeleportCommand extends CommandBase<NetherManager>
 			if (natural)
 			{
 				Plugin.InNether.put(caller, System.currentTimeMillis() + UtilTime.convert(10, TimeUnit.MINUTES, TimeUnit.MILLISECONDS));
-				Plugin.OverworldOrigins.put(caller, caller.getLocation());
 				caller.teleport(Plugin.getNetherWorld().getSpawnLocation());
 				ClansManager.getInstance().ClanTips.displayTip(TipType.ENTER_NETHER, caller);
 			}