diff --git a/advtrains/init.lua b/advtrains/init.lua
index 33e5b1d..f7d3b13 100644
--- a/advtrains/init.lua
+++ b/advtrains/init.lua
@@ -738,6 +738,21 @@ minetest.register_chatcommand("at_whereis",
 			end
 		end,
 })
+minetest.register_chatcommand("at_tp",
+	{
+		params = "<train id>",
+		description = "Teleports you to the position of the train with the given id",
+		privs = {train_operator = true, teleport = true},
+		func = function(name,param)
+			local train = advtrains.trains[param]
+			if not train or not train.last_pos then
+				return false, "Train "..param.." does not exist or is invalid"
+			else
+				minetest.get_player_by_name(name):set_pos(train.last_pos)
+				return true, "Teleporting to train "..param
+			end
+		end,
+})
 minetest.register_chatcommand("at_disable_step",
 	{
         params = "<yes/no>", 
diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua
index 730c623..677014a 100644
--- a/advtrains/wagons.lua
+++ b/advtrains/wagons.lua
@@ -970,7 +970,7 @@ function wagon:show_bordcom(pname)
 	local data = advtrains.wagons[self.id]
 	local linhei
 	
-	local form = "size[11,9]label[0.5,0;AdvTrains Boardcom v0.1 | "..attrans("Train ID")..": "..(minetest.formspec_escape(self.id or "")).."]"
+	local form = "size[11,9]label[0.5,0;AdvTrains Boardcom v0.1 | "..attrans("Train ID")..": "..(minetest.formspec_escape(train.id or "")).."]"
 	form=form.."textarea[0.5,1.5;7,1;text_outside;"..attrans("Text displayed outside on train")..";"..(minetest.formspec_escape(train.text_outside or "")).."]"
 	form=form.."textarea[0.5,3;7,1;text_inside;"..attrans("Text displayed inside train")..";"..(minetest.formspec_escape(train.text_inside or "")).."]"
 	form=form.."field[7.5,1.75;3,1;line;"..attrans("Line")..";"..(minetest.formspec_escape(train.line or "")).."]"