diff --git a/admin-root/config.html b/admin-root/config.html
index c1581c7c..1e597eef 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -41,7 +41,7 @@ configuration file itself is writable by the mt-daapd server.  If you
 make changes to these settings, they will not be reflected in the
 running server. The server must be restarted for these values to
 take effect.-->
-This is work in progress. no changes saved, some fields not updated, some not even in mt-daapd.conf</p>
+This is still in beta, but it seems to work. Go ahead and give it a spin.</p>
 <div id="config_not_writable_warning" style="display: none;">Your config file is not writable, you can not change anything using this webpage</div>
 <form id="theform" method="get" action="#">
 </form>
diff --git a/admin-root/config.js b/admin-root/config.js
index 59ae20ec..b2077d77 100644
--- a/admin-root/config.js
+++ b/admin-root/config.js
@@ -357,6 +357,8 @@ function saveForm() {
                                                  });
 }
 function cancelForm() {
+  alert("Cancel doesn't work, reload the page to revert your changes");
+return;
   ConfigXML.getSections().each(function (section){
     ConfigXML.getItems(section).each(function (itemId) {
       var item = ConfigXML.getOption(section,itemId);