diff --git a/octoserve/var/www/system.html b/octoserve/var/www/system.html
index d93494d..00c6c41 100644
--- a/octoserve/var/www/system.html
+++ b/octoserve/var/www/system.html
@@ -106,7 +106,11 @@ function SaveSettings()
       param += "strict=" + (NewSettings.strictEnabled?"1":"0");
     }
     
-    location.replace('/systemsettings.lua?'+param);
+    document.getElementById("SetButton").disabled = true;
+    if( param != "" )
+    {    
+      location.replace('/systemsettings.lua?'+param);
+    }
   }
 }
 
diff --git a/octoserve/var/www/systemsettings.lua b/octoserve/var/www/systemsettings.lua
index 8ce66c0..5b48097 100644
--- a/octoserve/var/www/systemsettings.lua
+++ b/octoserve/var/www/systemsettings.lua
@@ -165,6 +165,7 @@ if query ~= "" then
         if name == "strict" then restart = 1 end
       end
     end
+    os.execute("/bin/sync >/dev/null 2>&1");
     if restart == 1 then 
       os.execute("/etc/init.d/S99octo restartoctonet > /dev/null 2>&1 &")
       nextloc = "wait.html?10"