diff --git a/vMinecraftCommands.java b/vMinecraftCommands.java
index 4d05447f9..ef8cae536 100644
--- a/vMinecraftCommands.java
+++ b/vMinecraftCommands.java
@@ -60,6 +60,7 @@ public class vMinecraftCommands{
         cl.register("/tphere", "tphere");
         cl.register("/tpback", "tpback");
         cl.register("/masstp", "masstp", "Teleports those with lower permissions to you");
+        cl.register("/myspawn", "myspawn");
 
         //Health
         cl.register("/ezmodo", "invuln", "Toggle invulnerability");
@@ -197,6 +198,28 @@ public class vMinecraftCommands{
         }
         return EXIT_SUCCESS;
     }
+    //=====================================================================
+	//Function:	myspawn (/myspawn)
+	//Input:	Player player: The player using the command
+	//Output:	int: Exit Code
+	//Use:		Returns a player to their home but with penalties
+	//=====================================================================
+    public static int myspawn(Player player, String[] args){
+        if(player.canUseCommand("/myspawn") && vMinecraftSettings.getInstance().playerspawn())
+        {
+            player.sendMessage(Colors.DarkPurple + "Returned to myspawn");
+            player.sendMessage(Colors.Red + "Penalty: Inventory Cleared");
+            player.setHealth(20);
+            Warp home = null;
+            home = etc.getDataSource().getHome(player.getName());
+            player.teleportTo(home.Location);
+            Inventory inv = player.getInventory();
+            inv.clearContents();
+            inv.update();
+            return EXIT_SUCCESS;
+        }
+        return EXIT_FAIL;
+    }
     //=====================================================================
 	//Function:	prefix (/prefix)
 	//Input:	Player player: The player using the command
diff --git a/vMinecraftListener.java b/vMinecraftListener.java
index bc71019b7..23890651d 100644
--- a/vMinecraftListener.java
+++ b/vMinecraftListener.java
@@ -96,6 +96,12 @@ public class vMinecraftListener extends PluginListener {
                 Warp home = null;
                 home = etc.getDataSource().getHome(player.getName());
                 player.teleportTo(home.Location);
+                //Makes sure the player has a custom home before telling them about /myspawn
+                if(etc.getServer().getSpawnLocation() != etc.getDataSource().getHome(player.getName()).Location){
+                player.sendMessage(Colors.DarkPurple + "Return here with /myspawn, the penalty for returning is the complete loss of inventory");
+                } else {
+                    player.sendMessage(Colors.DarkPurple + "Set your own spawn with /myspawn");
+                }
                 }
                 vMinecraftUsers.getProfile(player).isDead(false);
                 vMinecraftChat.gmsg(Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg());