diff --git a/addressbook/inc/class.addressbook_export_vcard.inc.php b/addressbook/inc/class.addressbook_export_vcard.inc.php
index c20e280726..8ae8b19865 100644
--- a/addressbook/inc/class.addressbook_export_vcard.inc.php
+++ b/addressbook/inc/class.addressbook_export_vcard.inc.php
@@ -40,7 +40,7 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
-		if ($options['selection'] == 'use_all' || $options['selection'] == 'all') {
+		if ($options['selection'] == 'search') {
 			// uicontacts selection with checkbox 'use_all'
 			$query = $GLOBALS['egw']->session->appsession('index','addressbook');
 			$query['num_rows'] = -1;	// all
@@ -48,7 +48,7 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
 			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
 			$this->uicontacts->get_rows($query,$this->selection,$readonlys, true);	// only return the ids
 		}
-		elseif ( $options['selection'] == 'all_contacts' ) {
+		elseif ( $options['selection'] == 'all' ) {
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
 				$col_filter['account_id'] = null;
 			}
@@ -136,8 +136,8 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
 	 */
 	public function get_selectors_etpl() {
 		return array(
-			'name'		=> 'addressbook.export_csv_selectors',
-			'content'	=> 'use_all',
+			'name'		=> 'addressbook.export_vcard_selectors',
+			'content'	=> 'all',
 		);
 	}
 }
diff --git a/addressbook/templates/default/export_vcard_selectors.xet b/addressbook/templates/default/export_vcard_selectors.xet
new file mode 100644
index 0000000000..b10048900e
--- /dev/null
+++ b/addressbook/templates/default/export_vcard_selectors.xet
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="addressbook.export_vcard_selectors" template="" lang="" group="0" version="1.9.001">
+		<grid>
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<radio label="Use all" id="selection" options="all"/>
+				</row>
+				<row>
+					<radio label="Use search results" id="selection" options="search"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file