diff --git a/api/js/etemplate/et2_extension_customfields.js b/api/js/etemplate/et2_extension_customfields.js
index 1175433df7..fe5e76bb7e 100644
--- a/api/js/etemplate/et2_extension_customfields.js
+++ b/api/js/etemplate/et2_extension_customfields.js
@@ -490,7 +490,7 @@ var et2_customfields_list = /** @class */ (function (_super) {
         // No label on the widget itself
         delete (attrs.label);
         attrs.type = "link-entry";
-        attrs.only_app = field.type;
+        attrs.only_app = typeof field.only_app == "undefined" ? field.type : field.only_app;
         return true;
     };
     et2_customfields_list.prototype._setup_filemanager = function (field_name, field, attrs) {
diff --git a/api/js/etemplate/et2_extension_customfields.ts b/api/js/etemplate/et2_extension_customfields.ts
index fef7b45b38..0d86ce99b2 100644
--- a/api/js/etemplate/et2_extension_customfields.ts
+++ b/api/js/etemplate/et2_extension_customfields.ts
@@ -666,7 +666,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
 		delete(attrs.label);
 
 		attrs.type = "link-entry";
-		attrs.only_app = field.type;
+		attrs.only_app = typeof field.only_app == "undefined" ? field.type : field.only_app;
 		return true;
 	}
 
diff --git a/infolog/inc/class.infolog_export_csv.inc.php b/infolog/inc/class.infolog_export_csv.inc.php
index a2bd65c9f7..a8781b4b5f 100644
--- a/infolog/inc/class.infolog_export_csv.inc.php
+++ b/infolog/inc/class.infolog_export_csv.inc.php
@@ -294,6 +294,14 @@ class infolog_export_csv implements importexport_iface_export_plugin
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
 			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
 		}
+
+		// Add in filtering by contact
+		$filters['info_contact'] = array(
+			'name' => 'info_contact',
+			'label' => 'Contact',
+			'type' => 'link-entry',
+			'only_app' => ''
+		);
 	}
 
 	/**