diff --git a/admin-root/config.js b/admin-root/config.js
index 9d818f37..1b834c43 100644
--- a/admin-root/config.js
+++ b/admin-root/config.js
@@ -200,14 +200,14 @@ var Config = {
             }
             span.appendChild(document.createTextNode('\u00a0\u00a0'));
             href = Builder.node('a',{href: 'javascript://'},'Remove');
-            Event.observe(href,'click',Config._removeItem);
+            Event.observe(href,'click',Config._removeItemEvent);
             span.appendChild(href);
             span.appendChild(Builder.node('br'));
             frag.appendChild(span);
           });
           href = Builder.node('a',{href:'javascript://',className:'addItemHref'},item.add_item_label);
           frag.appendChild(href);
-          Event.observe(href,'click',Config._addItem);
+          Event.observe(href,'click',Config._addItemEvent);
           frag.appendChild(Builder.node('div',{style:'clear: both'}));
         } else {
           frag.appendChild(BuildElement.input(postId,postId,
@@ -235,40 +235,44 @@ var Config = {
     }
     return frag;
   },
-  _addItem: function(e) {
+  _addItemEvent: function (e) {
     var span = Event.element(e);
     while (span.nodeName.toLowerCase() != 'span') {
       span = span.previousSibling;
     }
-    var frag = document.createDocumentFragment();
-    span = span.cloneNode(true);
-    var id = span.getElementsByTagName('input')[0].id;
+    Config._addItem(span);      
+  },
+  _addItem: function(span) {
+    var newSpan = span.cloneNode(true);
+    var id = newSpan.getElementsByTagName('input')[0].id;
     var num = parseInt(id.match(/\d+$/));
     num++;
     var id = id.replace(/\d+$/,'') + num;
 
-    span.getElementsByTagName('label')[0].setAttribute('for',id);
-    span.getElementsByTagName('input')[0].id = id;
-    span.getElementsByTagName('input')[0].value = '';
-    var hrefs = span.getElementsByTagName('a');
+    newSpan.getElementsByTagName('label')[0].setAttribute('for',id);
+    newSpan.getElementsByTagName('input')[0].id = id;
+    newSpan.getElementsByTagName('input')[0].value = '';
+    var hrefs = newSpan.getElementsByTagName('a');
     if ('Netscape' == navigator.appName) {
       // Firefox et al doesn't copy registered events on an element deep clone
       // Don't know if that is w3c or if IE has it right
       if (hrefs.length == 1) {
-        Event.observe(hrefs[0],'click',Config._removeItem);
+        Event.observe(hrefs[0],'click',Config._removeItemEvent);
       } else {
         Event.observe(hrefs[0],'click',Config._browse);          
-        Event.observe(hrefs[1],'click',Config._removeItem);        
+        Event.observe(hrefs[1],'click',Config._removeItemEvent);        
       }
     }
-    var src = Event.element(e);
-    src.parentNode.insertBefore(span,src);
+    span.parentNode.insertBefore(newSpan,span.nextSibling);
   },
-  _removeItem: function(e) {
+  _removeItemEvent: function (e) {
     var span = Event.element(e);
     while (span.nodeName.toLowerCase() != 'span') {
       span = span.parentNode;
     }
+    Config._removeItem(span);
+  },
+  _removeItem: function(span) {
     if ((span.previousSibling && span.previousSibling.nodeName.toLowerCase() == 'span')||
         (span.nextSibling.nodeName.toLowerCase() == 'span'))  {
       Element.remove(span);
@@ -343,7 +347,19 @@ function saveForm() {
                                                  });
 }
 function cancelForm() {
-    //###TODO Handle default values for elements not returned by method=config
+  ConfigXML.getSections().each(function (section){
+    ConfigXML.getItems(section).each(function (itemId) {
+      var item = ConfigXML.getOption(section,itemId);
+      var itemConfigId = item.config_section + ':' + item.id;
+      if (item.multiple) {
+          // do the multiple thing
+      } else {
+          //###TODO potential error a select without a default value
+        $(itemConfigId).value = ConfigInitialValues.getValue(item.config_section,item.id) || item.default_value || '';
+      }
+    });
+  });
+  return;
   ConfigInitialValues.getValues().each(function (option) {
     if (typeof (option.value) == 'object') {
         //###TODO what if user removed one of the multiplevalued options?
diff --git a/admin-root/config.xml b/admin-root/config.xml
index c6620a04..7f34b612 100644
--- a/admin-root/config.xml
+++ b/admin-root/config.xml
@@ -54,10 +54,10 @@
             <short_description>
                 Should browsing data be compressed on the way to the client?
             </short_description>
-            <type default_value="0">select</type>
+            <type default_value="0">select</type>
             <options>
                 <option value="0">No</option>
-                <option value="1">Yes</option>
+                <option value="1">Yes</option>
             </options>
         </item>
         <item id="debug" config_section="general">
@@ -65,7 +65,7 @@
             <short_description>
                 Possible values are 0 to 9, 9 being the most detailed debug level.
             </short_description>
-            <type default_value="0">select</type>
+            <type default_value="0">select</type>
             <options>
                 <option value="0">0</option>
                 <option value="1">1</option>
@@ -76,7 +76,7 @@
                 <option value="6">6</option>
                 <option value="7">7</option>
                 <option value="8">8</option>
-                <option value="9">9</option>
+                <option value="9">9</option>
             </options>
         </item>
     </section>
@@ -102,10 +102,10 @@
             <short_description>
                 Should m3u files be processed as playlists?
             </short_description>
-            <type default_value="0">select</type>
+            <type default_value="0">select</type>
             <options>
                 <option value="0">No</option>
-                <option value="1">Yes</option>
+                <option value="1">Yes</option>
             </options>
         </item>
         <item id="compdirs" config_section="general">
@@ -119,10 +119,10 @@
         <item id="db_type" config_section="general">
             <name>Database Type</name>
             <short_description></short_description>
-            <type default="sqlite">select</type>
-            <options>
+            <type default_value="sqlite">select</type>
+            <options>
                 <option value="sqlite">sqlite</option>
-                <option value="sqlite3">sqlite3</option>
+                <option value="sqlite3">sqlite3</option>
             </options>
         </item>
         <item id="db_parms" config_section="general">
@@ -133,11 +133,11 @@
         <item id="scan_type" config_section="general">
             <name>Scan Type</name>
             <short_description></short_description>
-            <type default="2">select</type>
+            <type default_value="2">select</type>
             <options>
                 <option value="0">0 - Normal</option>
                 <option value="1">1 - Aggressive</option>
-                <option value="2">2 - Painfully aggressive</option>
+                <option value="2">2 - Painfully aggressive</option>
             </options>
         </item>
         <item id="rescan_interval" config_section="general">
@@ -150,10 +150,10 @@
         <item id="always_scan" config_section="general">
             <name>Always Scan</name>
             <short_description></short_description>
-            <type default="0">select</type>
+            <type default_value="0">select</type>
             <options>
                 <option value="0">No</option>
-                <option value="1">Yes</option>
+                <option value="1">Yes</option>
             </options>
         </item>
     </section>