diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
index e0c75b273f801b0e5d4fb4d4b559a97d1450a590..2c01da2b6b0a5fb89d313b992a85be9528c611bd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
@@ -152,7 +152,7 @@ public final class PersonPE extends HibernateAbstractRegistrationHolder implemen
     @Length(max = 50, message = ValidationMessages.USER_ID_LENGTH_MESSAGE)
     @NotNull(message = ValidationMessages.USER_ID_NOT_NULL_MESSAGE)
     @Pattern(regex = USER_CODE_REGEX, flags = java.util.regex.Pattern.CASE_INSENSITIVE, message = ValidationMessages.VALID_USER_CODE_DESCRIPTION)
-    @Field(index = Index.NO, name = SearchFieldConstants.PERSON_USER_ID, store = Store.YES)
+    @Field(index = Index.TOKENIZED, name = SearchFieldConstants.PERSON_USER_ID, store = Store.YES)
     public final String getUserId()
     {
         return userId;