diff --git a/common/src/main/java/de/uni_jena/thunibib/ldap/picker/ThUniBibLDAPWithLocalService.java b/common/src/main/java/de/uni_jena/thunibib/ldap/picker/ThUniBibLDAPWithLocalService.java
new file mode 100644
index 000000000..cb2436da1
--- /dev/null
+++ b/common/src/main/java/de/uni_jena/thunibib/ldap/picker/ThUniBibLDAPWithLocalService.java
@@ -0,0 +1,16 @@
+package de.uni_jena.thunibib.ldap.picker;
+
+import org.mycore.ubo.ldap.picker.LDAPWithLocalService;
+import org.mycore.ubo.picker.PersonSearchResult;
+
+import javax.naming.OperationNotSupportedException;
+
+public class ThUniBibLDAPWithLocalService extends LDAPWithLocalService {
+
+    @Override
+    public PersonSearchResult searchPerson(String query) throws OperationNotSupportedException {
+        PersonSearchResult results = super.searchPerson(query);
+        flipNameParts(results.personList);
+        return results;
+    }
+}
diff --git a/common/src/main/resources/config/thunibib-common/mycore.properties b/common/src/main/resources/config/thunibib-common/mycore.properties
index 70cb3c8ca..20bdd836d 100644
--- a/common/src/main/resources/config/thunibib-common/mycore.properties
+++ b/common/src/main/resources/config/thunibib-common/mycore.properties
@@ -92,7 +92,8 @@ MCR.user2.matching.lead_id=%UBO.projectid.default%
 
 MCR.user2.Realms.URI=
 
-MCR.IdentityPicker.strategy=org.mycore.ubo.ldap.picker.LDAPWithLocal
+#MCR.IdentityPicker.strategy=org.mycore.ubo.ldap.picker.LDAPWithLocal
+MCR.IdentityPicker.strategy=de.uni_jena.thunibib.ldap.picker.ThUniBibLDAPWithLocal
 MCR.IdentityPicker.strategy.Local.PID.Filter.enabled=false
 MCR.IdentityPicker.LDAP.normalization.ORCID.resolver=https://orcid.org/
 MCR.IdentityPicker.LDAP.SearchFormMapping.lastName=sn
diff --git a/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss b/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
index d451c7449..21e182526 100644
--- a/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
+++ b/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
@@ -28,7 +28,7 @@ a {
   color: $color-dark-blue;
 }
 
-i.ubo-picker-service-LDAPWithLocalService::before {
+i.ubo-picker-service-ThUniBibLDAPWithLocalService::before {
   color: $primary;
   content: "\f1ad";
 }