diff --git a/addressbook/templates/default/config.tpl b/addressbook/templates/default/config.tpl
index b4980ecdca..c664bfa213 100644
--- a/addressbook/templates/default/config.tpl
+++ b/addressbook/templates/default/config.tpl
@@ -47,10 +47,8 @@
   <tr bgcolor="{row_on}">
     <td>{lang_Enable_remote_search}:</td>
     <td>
-     <select name="newsettings[enable_remote_addressbook]">
-      <option value="">{lang_no}</option>
-	  <option value="True"{selected_enable_remote_addressbook_True}>{lang_yes}</option>
-     </select>
+     <input name="newsettings[enable_remote_addressbook]" type="radio" value=""{checked_enable_remote_addressbook+}>{lang_no}
+     <input name="newsettings[enable_remote_addressbook]" type="radio" value="True"{checked_enable_remote_addressbook+True}>{lang_yes}
     </td>
   </tr>
 <!-- END body -->
diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php
index 35e13c55fa..c0d087e874 100644
--- a/admin/inc/class.uiconfig.inc.php
+++ b/admin/inc/class.uiconfig.inc.php
@@ -181,7 +181,7 @@
 				}
 				$newval = implode(' ',$new);
 
-				switch ($type)
+				switch($type)
 				{
 					case 'lang':
 						$t->set_var($value,lang($newval));
@@ -198,19 +198,19 @@
 							$t->set_var($value,$current_config[$newval]);
 						}
 						break;
-					/*
 					case 'checked':
-						$newval = ereg_replace(' ','_',$newval);
-						if ($current_config[$newval])
+						/* '+' is used as a delimiter for the check value */
+						list($newvalue,$check) = split('\+',$newval);
+						$newval = ereg_replace(' ','_',$newvalue);
+						if($current_config[$newval] == $check)
 						{
-							$t->set_var($value,' checked');
+							$t->set_var($value, ' checked');
 						}
 						else
 						{
-							$t->set_var($value,'');
+							$t->set_var($value, '');
 						}
 						break;
-					*/
 					case 'selected':
 						$configs = array();
 						$config  = '';