diff --git a/Server/Forms/FrmMain.cs b/Server/Forms/FrmMain.cs
index 7289d4e4..c08bec1d 100644
--- a/Server/Forms/FrmMain.cs
+++ b/Server/Forms/FrmMain.cs
@@ -303,9 +303,9 @@ public void StartNoIpItegrator()
             updateThread.Start();
         }
 
-        private void NoIpUdater()
+        public void NoIpUdater()
         {
-            while (true)
+            while (XMLSettings.IntegrateNoIP)
             {
                 try
                 {
diff --git a/Server/Forms/FrmSettings.cs b/Server/Forms/FrmSettings.cs
index 2ef6a51d..996fd5ed 100644
--- a/Server/Forms/FrmSettings.cs
+++ b/Server/Forms/FrmSettings.cs
@@ -101,10 +101,10 @@ private void btnSave_Click(object sender, EventArgs e)
                 XMLSettings.NoIPHost = txtNoIPHost.Text;
 
                 XMLSettings.WriteValue("NoIPUsername", txtNoIPUser.Text);
-                XMLSettings.NoIPHost = txtNoIPUser.Text;
+                XMLSettings.NoIPUsername = txtNoIPUser.Text;
 
                 XMLSettings.WriteValue("NoIPPassword", txtNoIPPass.Text);
-                XMLSettings.NoIPHost = txtNoIPPass.Text;
+                XMLSettings.NoIPPassword = txtNoIPPass.Text;
             }
 
             this.Close();