diff --git a/etemplate/inc/class.etemplate_widget_customfields.inc.php b/etemplate/inc/class.etemplate_widget_customfields.inc.php
index 1a7ec2b118..42f9ea589f 100644
--- a/etemplate/inc/class.etemplate_widget_customfields.inc.php
+++ b/etemplate/inc/class.etemplate_widget_customfields.inc.php
@@ -188,7 +188,10 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
 					$sel_options[$lname] = lang($label);
 					$fields_with_vals[]=$lname;
 				}
-				$link_types = egw_link::app_list();
+				$link_types = array_intersect_key(egw_link::app_list('query'),egw_link::app_list('title'));
+				// Explicitly add in filemanager, which does not support query or title
+				$link_types['filemanager'] = lang('filemanager');
+
 				ksort($link_types);
 				foreach($link_types as $lname => $label)
 				{
diff --git a/etemplate/js/et2_extension_customfields.js b/etemplate/js/et2_extension_customfields.js
index fa54dada41..219d79a461 100644
--- a/etemplate/js/et2_extension_customfields.js
+++ b/etemplate/js/et2_extension_customfields.js
@@ -472,7 +472,11 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
 
 		return true;
 	},
-	 _setup_date: function(field_name, field, attrs) {
+	_setup_select_account: function(field_name, field, attrs) {
+		attrs.empty_label = egw.lang('Select');
+		return this._setup_select(field_name, field, attrs);
+	},
+	_setup_date: function(field_name, field, attrs) {
 		attrs.data_format = 'Y-m-d';
 		return true;
 	},