diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index cf8470d1..282e37c4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -725,7 +725,7 @@ namespace TShockAPI
             else
             {
                 var plr = players[0];
-                if (args.Player.Teleport(plr.TileX, plr.TileY))
+                if (args.Player.Teleport(plr.TileX, plr.TileY + 3))
                     args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name));
                 else
                     args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
@@ -759,7 +759,7 @@ namespace TShockAPI
             else
             {
                 var plr = players[0];
-                if (plr.Teleport(args.Player.TileX, args.Player.TileY))
+                if (plr.Teleport(args.Player.TileX, args.Player.TileY + 3))
                 {
                     plr.SendMessage(string.Format("You were teleported to {0}.", plr.Name));
                     args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name));
@@ -848,7 +848,7 @@ namespace TShockAPI
                     var warp = WarpsManager.FindWarp(warpName);
                     if (warp != Vector2.Zero)
                     {
-                        if (args.Player.Teleport((int)warp.X, (int)warp.Y))
+                        if (args.Player.Teleport((int)warp.X, (int)warp.Y + 3))
                             args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
                         else
                             args.Player.SendMessage("Warp unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
@@ -871,7 +871,7 @@ namespace TShockAPI
         private static void SetSpawn(CommandArgs args)
         {
             ConfigurationManager.spawnTileX = args.Player.TileX;
-            ConfigurationManager.spawnTileY = args.Player.TileY;
+            ConfigurationManager.spawnTileY = args.Player.TileY + 3;
             ConfigurationManager.Spawn_WorldID = Main.worldID;
             ConfigurationManager.WriteJsonConfiguration();
             args.Player.SendMessage("Set server spawn point to your position");
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 5628163a..906980f2 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -596,6 +596,9 @@ namespace TShockAPI
                     if (playerIP.IP == Players[who].IP)
                     {
                         Players[who].Teleport((int)playerIP.Pos.X, (int)playerIP.Pos.Y);
+                        RemeberedPosManager.RemeberedPosistions.Remove(playerIP);
+                        RemeberedPosManager.WriteSettings();
+                        break;
                     }
                 }
             }