diff --git a/agent/windows-setup-agent/SetupWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs
index 46c036d0c..2f78d3ffd 100644
--- a/agent/windows-setup-agent/SetupWizard.Designer.cs
+++ b/agent/windows-setup-agent/SetupWizard.Designer.cs
@@ -81,6 +81,7 @@
             this.txtError = new System.Windows.Forms.TextBox();
             this.lblError = new System.Windows.Forms.Label();
             this.picBanner = new System.Windows.Forms.PictureBox();
+            this.btnEditEndpoint = new System.Windows.Forms.Button();
             this.tabFinish.SuspendLayout();
             this.tabConfigure.SuspendLayout();
             this.tabParameters.SuspendLayout();
@@ -345,6 +346,7 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.btnEditEndpoint);
             this.groupBox1.Controls.Add(this.btnRemoveEndpoint);
             this.groupBox1.Controls.Add(this.btnAddEndpoint);
             this.groupBox1.Controls.Add(this.lvwEndpoints);
@@ -360,7 +362,7 @@
             // btnRemoveEndpoint
             // 
             this.btnRemoveEndpoint.Enabled = false;
-            this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 112);
+            this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 141);
             this.btnRemoveEndpoint.Name = "btnRemoveEndpoint";
             this.btnRemoveEndpoint.Size = new System.Drawing.Size(75, 23);
             this.btnRemoveEndpoint.TabIndex = 6;
@@ -626,6 +628,17 @@
             this.picBanner.TabIndex = 1;
             this.picBanner.TabStop = false;
             // 
+            // btnEditEndpoint
+            // 
+            this.btnEditEndpoint.Enabled = false;
+            this.btnEditEndpoint.Location = new System.Drawing.Point(520, 112);
+            this.btnEditEndpoint.Name = "btnEditEndpoint";
+            this.btnEditEndpoint.Size = new System.Drawing.Size(75, 23);
+            this.btnEditEndpoint.TabIndex = 7;
+            this.btnEditEndpoint.Text = "Edit";
+            this.btnEditEndpoint.UseVisualStyleBackColor = true;
+            this.btnEditEndpoint.Click += new System.EventHandler(this.btnEditEndpoint_Click);
+            // 
             // SetupWizard
             // 
             this.AcceptButton = this.btnNext;
@@ -723,6 +736,7 @@
 		private System.Windows.Forms.CheckBox chkInstallNSCP;
 		private System.Windows.Forms.TextBox txtUser;
 		private System.Windows.Forms.CheckBox chkRunServiceAsThisUser;
-	}
+        private System.Windows.Forms.Button btnEditEndpoint;
+    }
 }
 
diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
index 6ea48d89e..857df1e16 100644
--- a/agent/windows-setup-agent/SetupWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -478,6 +478,7 @@ namespace Icinga
 		private void lvwEndpoints_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			btnRemoveEndpoint.Enabled = lvwEndpoints.SelectedItems.Count > 0;
+            btnEditEndpoint.Enabled = lvwEndpoints.SelectedItems.Count > 0;
 		}
 
 		private void lvwX509Fields_SelectedIndexChanged(object sender, EventArgs e)
@@ -496,12 +497,43 @@ namespace Icinga
 				lvwEndpoints.Items.Remove(lvwEndpoints.SelectedItems[0]);
 			}
 		}
-
-		private void chkRunServiceAsThisUser_CheckedChanged(object sender, EventArgs e)
+    
+        private void chkRunServiceAsThisUser_CheckedChanged(object sender, EventArgs e)
 		{
 			txtUser.Enabled = !txtUser.Enabled;
 			if (!txtUser.Enabled)
 				txtUser.Text = Icinga2User;
 		}
-	}
+    
+        private void btnEditEndpoint_Click(object sender, EventArgs e)
+        {
+            ListViewItem lvi = lvwEndpoints.SelectedItems[0];
+            EndpointInputBox eib = new EndpointInputBox();
+
+            eib.Text = "Edit Endpoint";
+            eib.txtInstanceName.Text = lvi.SubItems[0].Text;
+
+            if (lvi.SubItems.Count >= 2) {
+                eib.txtHost.Text = lvi.SubItems[1].Text;
+                eib.txtPort.Text = lvi.SubItems[2].Text;
+                eib.chkConnect.Checked = true;
+            }
+
+            if (eib.ShowDialog(this) == DialogResult.Cancel)
+                return;
+
+            lvwEndpoints.Items.Remove(lvi);
+
+            ListViewItem lvi2 = new ListViewItem();
+            lvi2.Text = eib.txtInstanceName.Text;
+
+            if (eib.chkConnect.Checked) {
+                lvi2.SubItems.Add(eib.txtHost.Text);
+                lvi2.SubItems.Add(eib.txtPort.Text);
+            }
+
+            lvwEndpoints.Items.Add(lvi2);
+        }
+    }
 }
+
diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png
index 626adaccb..4fa251dea 100644
Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png differ
diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png
index 035c06113..851d64d6f 100644
Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png differ
diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png
index c7e180ba1..b85d5218a 100644
Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png differ