diff --git a/admin/config.php b/admin/config.php
index bed2bba89b..5c9b09f9c3 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -60,6 +60,10 @@
 			{
 				$c->config_data[$key] = $config;
 			}
+			else
+			{
+				unset($c->config_data[$key]);
+			}
 		}
 		$c->save_repository(True);
 
@@ -103,7 +107,7 @@
 				$newval = ereg_replace(' ','_',$newval);
 				$t->set_var($value,$current_config[$newval]);
 				break;
-			case "checked":
+/*			case "checked":
 				$newval = ereg_replace(' ','_',$newval);
 				if ($current_config[$newval])
 				{
@@ -113,7 +117,7 @@
 				{
 					$t->set_var($value,'');
 				}
-				break;
+				break;*/
 			case "selected":
 				$configs = array();
 				$config  = '';
@@ -124,6 +128,7 @@
 					$configs[] = $newvals[$i];
 				}
 				$config = implode('_',$configs);
+				/* echo $config . '=' . $current_config[$config]; */
 				if ($current_config[$config] == $setting)
 				{
 					$t->set_var($value,' selected');
diff --git a/preferences/templates/default/config.tpl b/preferences/templates/default/config.tpl
index d6991e1c3b..6b6744f93a 100644
--- a/preferences/templates/default/config.tpl
+++ b/preferences/templates/default/config.tpl
@@ -58,24 +58,43 @@
 
    <tr bgcolor="{row_on}">
     <td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td>
-    <td><input type="checkbox" name="newsettings[htmlcompliant]" value="True" {checked_htmlcompliant}></td>
+    <td>
+     <select name="newsettings[htmlcompliant]">
+      <option value="">No</option>
+      <option value="True"{selected_htmlcompliant_True}>Yes</option>
+     </select>
+    </td>
    </tr>
 
    <tr bgcolor="{row_off}">
     <td>{lang_Use_cookies_to_pass_sessionid}:</td>
-    <td><input type="checkbox" name="newsettings[usecookies]" value="True" {checked_usecookies}></td>
+    <td>
+     <select name="newsettings[usecookies]">
+      <option value="">No</option>
+      <option value="True"{selected_usecookies_True}>Yes</option>
+     </select>
+    </td>
    </tr>
 
    <tr bgcolor="{row_on}">
     <td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version<br>when_admins_login_?}:</td>
-    <td><input type="checkbox" name="newsettings[checkfornewversion]" value="True" {checked_checkfornewversion}></td>
+    <td>
+     <select name="newsettings[checkfornewversion]">
+      <option value="">No</option>
+      <option value="True"{selected_checkfornewversion_True}>Yes</option>
+     </select>
+    </td>
    </tr>
 
    <tr bgcolor="{row_off}">
-    <td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array ?}:</td>   
-    <td><input type="checkbox" name="newsettings[cache_phpgw_info]" value="True" {checked_cache_phpgw_info}></td>
-   </tr> 
-
+    <td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array ?}:</td>
+    <td>
+     <select name="newsettings[cache_phpgw_info]">
+      <option value="">No</option>
+      <option value="True"{selected_cache_phpgw_info_True}>Yes</option>
+     </select>
+    </td>
+   </tr>
 <!-- END body -->
 
 <!-- BEGIN footer -->