diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
index ae5072029..dfec78a14 100644
--- a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
+++ b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
@@ -969,6 +969,10 @@ function ObjectBuilderGui::processNewObject(%this, %obj)
    if ( !isObject( %obj ) )
       return;
       
+   %controlMask = $TypeMasks::PlayerObjectType | $TypeMasks::VehicleObjectType;
+   if (%obj.control)
+    localClientConnection.setControlobject(%obj);
+    
    // Add the object to the group.
    if( %this.objectGroup !$= "" )
       %this.objectGroup.add( %obj );
@@ -1459,6 +1463,45 @@ function ObjectBuilderGui::buildPlayerDropPoint(%this)
    %this.process();
 }
 
+function ObjectBuilderGui::buildPlayer(%this)
+{
+   %this.objectClassName = "Player";
+   %this.addField("dataBlock",    "TypeDataBlock", "dataBlock",   "PlayerData");
+   %this.addField("control", "TypeBool", "control?", "false");
+   %this.process();
+}
+
+function ObjectBuilderGui::buildAIPlayer(%this)
+{
+   %this.objectClassName = "AIPlayer";
+   %this.addField("dataBlock",    "TypeDataBlock", "dataBlock",   "PlayerData");
+   %this.process();
+}
+
+function ObjectBuilderGui::buildWheeledVehicle(%this)
+{
+   %this.objectClassName = "Player";
+   %this.addField("dataBlock",    "TypeDataBlock", "dataBlock",   "WheeledVehicleData");
+   %this.addField("control", "TypeBool", "control?", "false");
+   %this.process();
+}
+
+function ObjectBuilderGui::buildHoverVehicle(%this)
+{
+   %this.objectClassName = "Player";
+   %this.addField("dataBlock",    "TypeDataBlock", "dataBlock",   "HoverVehicleData");
+   %this.addField("control", "TypeBool", "control?", "false");
+   %this.process();
+}
+
+function ObjectBuilderGui::buildFlyingVehicle(%this)
+{
+   %this.objectClassName = "Player";
+   %this.addField("dataBlock",    "TypeDataBlock", "dataBlock",   "FlyingVehicleData");
+   %this.addField("control", "TypeBool", "control?", "false");
+   %this.process();
+}
+
 function ObjectBuilderGui::buildObserverDropPoint(%this)
 {
    %this.objectClassName = "SpawnSphere";