diff --git a/OpenRA.Editor/Form1.Designer.cs b/OpenRA.Editor/Form1.Designer.cs
index 7b578c5693..1fae5a3154 100755
--- a/OpenRA.Editor/Form1.Designer.cs
+++ b/OpenRA.Editor/Form1.Designer.cs
@@ -80,6 +80,7 @@ namespace OpenRA.Editor
 			this.toolStripStatusLabelFiller = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripStatusLabelMousePosition = new System.Windows.Forms.ToolStripStatusLabel();
 			this.fixOpenAreasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.setupDefaultPlayersMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.splitContainer1.Panel1.SuspendLayout();
 			this.splitContainer1.Panel2.SuspendLayout();
 			this.splitContainer1.SuspendLayout();
@@ -397,7 +398,8 @@ namespace OpenRA.Editor
             this.resizeToolStripMenuItem,
             this.showActorNamesToolStripMenuItem,
             this.showGridToolStripMenuItem,
-            this.fixOpenAreasToolStripMenuItem});
+            this.fixOpenAreasToolStripMenuItem,
+			this.setupDefaultPlayersMenuItem});
 			this.mapToolStripMenuItem.Name = "mapToolStripMenuItem";
 			this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 23);
 			this.mapToolStripMenuItem.Text = "&Map";
@@ -479,6 +481,13 @@ namespace OpenRA.Editor
 			this.fixOpenAreasToolStripMenuItem.Text = "&Fix Open Areas";
 			this.fixOpenAreasToolStripMenuItem.Click += new System.EventHandler(this.FixOpenAreas);
 			//
+			// setupDefaultPlayersMenuItem
+			//
+			this.setupDefaultPlayersMenuItem.Name = "setupDefaultPlayersMenuItem";
+			this.setupDefaultPlayersMenuItem.Size = new System.Drawing.Size(175, 22);
+			this.setupDefaultPlayersMenuItem.Text = "&Setup Default Players";
+			this.setupDefaultPlayersMenuItem.Click += new System.EventHandler(this.SetupDefaultPlayers);
+			//
 			// Form1
 			//
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -561,6 +570,7 @@ namespace OpenRA.Editor
 		private System.Windows.Forms.ToolStripMenuItem showActorNamesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem showGridToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem fixOpenAreasToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem setupDefaultPlayersMenuItem;
 
 	}
 }
diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 628116ac3f..cb807e0626 100755
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -447,5 +447,14 @@ namespace OpenRA.Editor
 			surface1.Chunks.Clear();
 			surface1.Invalidate();
 		}
+
+		void SetupDefaultPlayers(object sender, EventArgs e)
+		{
+			dirty = true;
+			surface1.Map.MakeDefaultPlayers();
+
+			surface1.Chunks.Clear();
+			surface1.Invalidate();
+		}
 	}
 }
diff --git a/OpenRA.FileFormats/Map/PlayerReference.cs b/OpenRA.FileFormats/Map/PlayerReference.cs
index 0405325d31..199741e248 100644
--- a/OpenRA.FileFormats/Map/PlayerReference.cs
+++ b/OpenRA.FileFormats/Map/PlayerReference.cs
@@ -41,9 +41,6 @@ namespace OpenRA.FileFormats
 		public string[] Enemies = {};
 
 		public PlayerReference() {}
-		public PlayerReference(MiniYaml my)
-		{
-			FieldLoader.Load(this, my);
-		}
+		public PlayerReference(MiniYaml my) { FieldLoader.Load(this, my); }
 	}
 }