diff --git a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
index 38dbb8cf..149bb457 100644
--- a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
@@ -39,6 +39,7 @@ appsuite:
     uiSettings:
       # Enterprise contact picker
       io.ox/core//features/enterprisePicker/enabled: "true"
+      io.ox/contacts//search/fields: 'email1,email2'
 
     yamlFiles:
       contacts-provider-ldap.yml:
@@ -286,6 +287,7 @@ appsuite:
           givenname: "givenName"
           surname: "sn"
           email1: "mailPrimaryAddress"
+          email2: "mailAlternativeAddress"
           department: "oxDepartment,department"
           company: "oxCompany,o"
           branches: "oxBranches"
@@ -297,8 +299,6 @@ appsuite:
           city_home: "oxCityHome"
           commercial_register: "oxCommercialRegister"
           country_home: "oxCountryHome"
-          email2: "oxEmail2"
-          email3: "oxEmail3"
           employeetype: "employeeType"
           fax_business: "oxFaxBusiness,facsimileTelehoneNumber"
           fax_home: "oxFaxHome"