diff --git a/config/initial-objects/report/110-report-user-list.xml b/config/initial-objects/report/110-report-user-list.xml
index 535c8bc9145..fc8058fb3aa 100644
--- a/config/initial-objects/report/110-report-user-list.xml
+++ b/config/initial-objects/report/110-report-user-list.xml
@@ -97,11 +97,16 @@
                 <previousColumn>nameColumn</previousColumn>
             </column>
             <column id="8">
-                <name>activationColumn</name>
-                <path>activation/administrativeStatus</path>
+                <name>displayNameColumn</name>
+                <path>displayName</path>
                 <previousColumn>fullNameColumn</previousColumn>
             </column>
             <column id="9">
+                <name>activationColumn</name>
+                <path>activation/administrativeStatus</path>
+                <previousColumn>displayNameColumn</previousColumn>
+            </column>
+            <column id="10">
                 <name>roleColumn</name>
                 <path>assignment</path>
                 <display>
@@ -133,7 +138,7 @@
                 </export>
                 <previousColumn>activationColumn</previousColumn>
             </column>
-            <column id="10">
+            <column id="11">
                 <name>orgColumn</name>
                 <path>assignment</path>
                 <display>
@@ -165,7 +170,7 @@
                 </export>
                 <previousColumn>roleColumn</previousColumn>
             </column>
-            <column id="11">
+            <column id="12">
                 <name>accountColumn</name>
                 <path>linkRef</path>
                 <display>
diff --git a/config/initial-objects/user/050-user-administrator.xml b/config/initial-objects/user/050-user-administrator.xml
index 1c794769599..ed5bcc761f6 100644
--- a/config/initial-objects/user/050-user-administrator.xml
+++ b/config/initial-objects/user/050-user-administrator.xml
@@ -12,6 +12,7 @@
     <name>administrator</name>
     <indestructible>true</indestructible>
     <fullName>midPoint Administrator</fullName>
+    <displayName>midPoint Administrator</displayName>
     <givenName>midPoint</givenName>
     <familyName>Administrator</familyName>
     <assignment id="1">
diff --git a/config/sql/native/postgres-upgrade.sql b/config/sql/native/postgres-upgrade.sql
index 70e6e101c37..cdcc4479cf9 100644
--- a/config/sql/native/postgres-upgrade.sql
+++ b/config/sql/native/postgres-upgrade.sql
@@ -1168,6 +1168,17 @@ CREATE INDEX m_connector_typeVersionHost_key
     WHERE connectorHostRefTargetOid IS NOT NULL;
 $aa$);
 
+call apply_change(58, $aa$
+ALTER TABLE m_user
+    ADD COLUMN displayNameOrig TEXT,
+    ADD COLUMN displayNameNorm TEXT,
+    ADD COLUMN preferredNameOrig TEXT,
+    ADD COLUMN preferredNameNorm TEXT;
+
+CREATE INDEX m_user_displayNameOrig_idx ON m_user (displayNameOrig);
+CREATE INDEX m_user_preferredNameOrig_idx ON m_user (preferredNameOrig);
+$aa$);
+
 ---
 -- WRITE CHANGES ABOVE ^^
 -- IMPORTANT: update apply_change number at the end of postgres-new.sql
diff --git a/config/sql/native/postgres.sql b/config/sql/native/postgres.sql
index b754c2646d6..a7ea0776f4f 100644
--- a/config/sql/native/postgres.sql
+++ b/config/sql/native/postgres.sql
@@ -632,6 +632,8 @@ CREATE TABLE m_user (
         CHECK (objectType = 'USER'),
     additionalNameOrig TEXT,
     additionalNameNorm TEXT,
+    displayNameOrig TEXT,
+    displayNameNorm TEXT,
     employeeNumber TEXT,
     familyNameOrig TEXT,
     familyNameNorm TEXT,
@@ -646,6 +648,8 @@ CREATE TABLE m_user (
     nickNameOrig TEXT,
     nickNameNorm TEXT,
     personalNumber TEXT,
+    preferredNameOrig TEXT,
+    preferredNameNorm TEXT,
     titleOrig TEXT,
     titleNorm TEXT,
     organizations JSONB, -- array of {o,n} objects (poly-strings)
@@ -664,10 +668,12 @@ CREATE INDEX m_user_nameOrig_idx ON m_user (nameOrig);
 CREATE UNIQUE INDEX m_user_nameNorm_key ON m_user (nameNorm);
 CREATE INDEX m_user_policySituation_idx ON m_user USING gin(policysituations gin__int_ops);
 CREATE INDEX m_user_ext_idx ON m_user USING gin(ext);
+CREATE INDEX m_user_displayNameOrig_idx ON m_user (displayNameOrig);
 CREATE INDEX m_user_fullNameOrig_idx ON m_user (fullNameOrig);
 CREATE INDEX m_user_familyNameOrig_idx ON m_user (familyNameOrig);
 CREATE INDEX m_user_givenNameOrig_idx ON m_user (givenNameOrig);
 CREATE INDEX m_user_employeeNumber_idx ON m_user (employeeNumber);
+CREATE INDEX m_user_preferredNameOrig_idx ON m_user (preferredNameOrig);
 CREATE INDEX m_user_subtypes_idx ON m_user USING gin(subtypes);
 CREATE INDEX m_user_organizations_idx ON m_user USING gin(organizations);
 CREATE INDEX m_user_organizationUnits_idx ON m_user USING gin(organizationUnits);
@@ -2689,4 +2695,4 @@ END $$;
 -- This is important to avoid applying any change more than once.
 -- Also update SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER
 -- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
-call apply_change(57, $$ SELECT 1 $$, true);
+call apply_change(58, $$ SELECT 1 $$, true);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 80a390f980d..e706e9bf7d7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -346,7 +346,7 @@ public static String getReferencedObjectDisplayNameAndName(Referencable ref, boo
         ObjectType object = prismObject.asObjectable();
         String displayName = null;
         if (object instanceof UserType) {
-            displayName = getTranslatedPolyString(((UserType) object).getFullName());
+            displayName = getTranslatedPolyString(((UserType) object).getDisplayName());
         } else if (object instanceof AbstractRoleType) {
             displayName = getTranslatedPolyString(((AbstractRoleType) object).getDisplayName());
         }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
index 83acb6a3f18..52168cd7553 100755
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
@@ -55,7 +55,8 @@ public class SearchBoxConfigurationBuilder {
                 ItemPath.create(ObjectType.F_NAME))
         );
         FIXED_SEARCH_ITEMS.put(UserType.class, Arrays.asList(
-                ItemPath.create(UserType.F_FULL_NAME)
+                ItemPath.create(UserType.F_FULL_NAME),
+                ItemPath.create(UserType.F_DISPLAY_NAME)
         ));
         FIXED_SEARCH_ITEMS.put(AbstractRoleType.class, Arrays.asList(
                 ItemPath.create(RoleType.F_DISPLAY_NAME)
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
index bad02e42763..adfdfb96af0 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
@@ -100,6 +100,7 @@ public SearchableItemsDefinitions additionalSearchContext(SearchContext ctx) {
                 ItemPath.create(UserType.F_GIVEN_NAME),
                 ItemPath.create(UserType.F_FAMILY_NAME),
                 ItemPath.create(UserType.F_FULL_NAME),
+                ItemPath.create(UserType.F_DISPLAY_NAME),
                 ItemPath.create(UserType.F_ADDITIONAL_NAME),
                 ItemPath.create(UserType.F_EMPLOYEE_NUMBER),
                 ItemPath.create(UserType.F_ORGANIZATIONAL_UNIT),
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/AccessRequestMixin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/AccessRequestMixin.java
index 0bcb4a0223c..5def3591ca1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/AccessRequestMixin.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/AccessRequestMixin.java
@@ -74,8 +74,8 @@ default ObjectFilter createAutocompleteFilter(String text, SearchFilterType filt
 
     default String getDefaultUserDisplayName(PrismObject<UserType> o) {
         String name = WebComponentUtil.getOrigStringFromPoly(o.getName());
-        String fullName = WebComponentUtil.getOrigStringFromPoly(o.asObjectable().getFullName());
+        String displayName = WebComponentUtil.getOrigStringFromPoly(o.asObjectable().getDisplayName());
 
-        return StringUtils.isNotEmpty(fullName) ? fullName + " (" + name + ")" : name;
+        return StringUtils.isNotEmpty(displayName) ? displayName + " (" + name + ")" : name;
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
index 8279f63d931..4f7af882aa5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
@@ -11,6 +11,7 @@
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.component.input.DateTimePickerPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.user.PageUser;
@@ -624,8 +625,8 @@ private String getUserDisplayName(){
         } else {
             UserType delegationUser = getModelObject().getDelegationOwner();
             if (getModelObject().getDelegationOwner() != null) {
-                if (delegationUser.getFullName() != null && StringUtils.isNotEmpty(delegationUser.getFullName().getOrig())) {
-                    displayName = delegationUser.getFullName().getOrig() + " (" + delegationUser.getName().getOrig() + ")";
+                if (delegationUser.getDisplayName() != null && StringUtils.isNotEmpty(delegationUser.getDisplayName().getOrig())) {
+                    displayName = delegationUser.getDisplayName().getOrig() + " (" + delegationUser.getName().getOrig() + ")";
                 } else {
                     displayName = delegationUser.getName() != null ? delegationUser.getName().getOrig() : "";
                 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
index 5686985950d..04fbf214064 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -321,6 +321,8 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
                         SelectableBeanImpl.F_VALUE + ".familyName", false, true),
                 new ColumnTypeDto<>("UserType.fullName", UserType.F_FULL_NAME.getLocalPart(),
                         SelectableBeanImpl.F_VALUE + ".fullName", false, true),
+                new ColumnTypeDto<>("UserType.displayName", UserType.F_DISPLAY_NAME.getLocalPart(),
+                        SelectableBeanImpl.F_VALUE + ".displayName", false, true),
                 new ColumnTypeDto<>("UserType.emailAddress", UserType.F_EMAIL_ADDRESS.getLocalPart(),
                         SelectableBeanImpl.F_VALUE + ".emailAddress", false)
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
index c667fe8e9f7..5f13cf5d418 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java
@@ -39,6 +39,7 @@
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 /**
  * @author Viliam Repan (lazyman)
@@ -132,6 +133,12 @@ private String getShortUserName() {
         }
 
         if (principalObj instanceof MidPointPrincipal principal) {
+            if (principal.getFocus() instanceof UserType user) {
+                String displayName = WebComponentUtil.getOrigStringFromPoly(user.getDisplayName());
+                if (StringUtils.isNotEmpty(displayName)) {
+                    return displayName;
+                }
+            }
             return WebComponentUtil.getOrigStringFromPoly(principal.getName());
         }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
index 7dc60da3399..aad0cbf9ae4 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
@@ -21,6 +21,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
+import org.apache.commons.lang3.StringUtils;
+
 import static com.evolveum.midpoint.gui.api.page.PageBase.createEnumResourceKey;
 import static com.evolveum.midpoint.gui.api.page.PageBase.createStringResourceStatic;
 import static com.evolveum.midpoint.schema.util.CertCampaignTypeUtil.norm;
@@ -65,7 +67,7 @@ public static String resolveOwnerName(ObjectReferenceType ownerRef, PageBase pag
         ObjectType owner = ownerObject.asObjectable();
         if (owner instanceof UserType) {
             UserType user = (UserType) owner;
-            return WebComponentUtil.getName(user) + " (" + WebComponentUtil.getOrigStringFromPoly(user.getFullName()) + ")";
+            return WebComponentUtil.getName(user) + " (" + WebComponentUtil.getOrigStringFromPoly(user.getDisplayName()) + ")";
         } else {
             return WebComponentUtil.getName(owner);
         }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
index dc353d924b0..a7fb1588f66 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
@@ -73,16 +73,16 @@ public String getCaseInfoButtonTitle(IModel<? extends CertCaseOrWorkItemDto> row
         String objectType = getLocalizedTypeName(acase.getObjectRef().getType(), page);
         String objectName = dto.getObjectName();
 
-        // If object is UserType, display user's fullName in addition to the name
+        // If object is UserType, display user's displayName in addition to the name
         if (QNameUtil.match(acase.getObjectRef().getType(), UserType.COMPLEX_TYPE)) {
             try {
                 PrismObject<UserType> object = page.getModelService().getObject(UserType.class, acase.getObjectRef().getOid(), null, page.getPageTask(), page.getPageTask().getResult());
 
                 if (object != null) {
                     UserType userObj = object.asObjectable();
-                    PolyStringType fullName = userObj.getFullName();
-                    if (fullName != null && !StringUtils.isEmpty(fullName.getOrig())) {
-                        objectName = fullName.getOrig() + " (" + objectName + ")";
+                    PolyStringType displayName = userObj.getDisplayName();
+                    if (displayName != null && !StringUtils.isEmpty(displayName.getOrig())) {
+                        objectName = displayName.getOrig() + " (" + objectName + ")";
                     }
                 }
             } catch (Exception e) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
index c0611a11b08..8459fcfc0d6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
@@ -36,7 +36,7 @@ private void initLayout(Class<F> type){
 
         Label fullNameLabel;
         if (UserType.class.equals(type)){
-            fullNameLabel = new Label(ID_OBJECT_FULLNAME, ((UserType) mergeObject).getFullName());
+            fullNameLabel = new Label(ID_OBJECT_FULLNAME, ((UserType) mergeObject).getDisplayName());
         } else {
             fullNameLabel = new Label(ID_OBJECT_FULLNAME, ((AbstractRoleType) mergeObject).getDisplayName());
         }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
index 12456137a3f..3fcebdd6c28 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/UserSummaryPanel.java
@@ -13,11 +13,10 @@
 import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.apache.wicket.model.IModel;
-
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.web.component.FocusSummaryPanel;
 import com.evolveum.midpoint.web.component.util.SummaryTag;
+import org.apache.wicket.model.IModel;
 
 /**
  * @author semancik
@@ -124,7 +123,7 @@ protected void initialize(UserType object) {
 
     @Override
     protected QName getDisplayNamePropertyName() {
-        return UserType.F_FULL_NAME;
+        return UserType.F_DISPLAY_NAME;
     }
 
     @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
index 2b56e8375b9..0c11d28f821 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
@@ -169,6 +169,10 @@ private List<IColumn<SelectableBean<UserType>, String>> initColumns() {
                 UserType.F_FAMILY_NAME.getLocalPart(), SelectableBeanImpl.F_VALUE + ".familyName");
         columns.add(column);
 
+        column = new PropertyColumn<>(createStringResource("UserType.displayName"),
+                UserType.F_DISPLAY_NAME.getLocalPart(), SelectableBeanImpl.F_VALUE + ".displayName");
+        columns.add(column);
+
         column = new PropertyColumn<>(createStringResource("UserType.fullName"),
                 UserType.F_FULL_NAME.getLocalPart(), SelectableBeanImpl.F_VALUE + ".fullName");
         columns.add(column);
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
index cf7902a4ef7..b9a53af6966 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
@@ -884,16 +884,16 @@ public static LocalizableMessage createDisplayInformation(PrismObject<?> object,
     }
 
     /**
-     * - User name is in the form of "full name (object name)".
+     * - User name is in the form of "display name (object name)".
      * - Names for other objects are either "detailed display name" ({@link #getDetailedDisplayName(Objectable)}) or plain name.
      */
     private static Object getDescriptiveName(Objectable object) {
         if (object instanceof UserType) {
-            PolyStringType fullName = ((UserType) object).getFullName();
-            if (fullName != null) {
+            PolyStringType displayName = ((UserType) object).getDisplayName();
+            if (displayName != null) {
                 return new LocalizableMessageBuilder()
                         .key(SchemaConstants.USER_DESCRIPTIVE_NAME)
-                        .arg(fullName)
+                        .arg(displayName)
                         .arg(object.getName())
                         .build();
             } else {
@@ -1112,7 +1112,7 @@ public static Collection<ObjectReferenceType> createObjectRefs(Collection<PrismR
     }
 
     /**
-     * Returns display name for given object, e.g. fullName for a user, displayName for a role,
+     * Returns display name for given object, e.g. displayName for a user or role,
      * and more detailed description for a shadow. TODO where exactly does this method belong?
      */
     public static String getDetailedDisplayName(PrismObject<?> object) {
@@ -1122,7 +1122,7 @@ public static String getDetailedDisplayName(PrismObject<?> object) {
 
     public static String getDetailedDisplayName(Objectable objectable) {
         if (objectable instanceof UserType) {
-            return getOrig(((UserType) objectable).getFullName());
+            return getOrig(((UserType) objectable).getDisplayName());
         } else if (objectable instanceof AbstractRoleType) {
             return getOrig(((AbstractRoleType) objectable).getDisplayName());
         } else if (objectable instanceof ShadowType) {
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
index efeaed27c7a..6f6e58a5c0e 100755
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -2123,6 +2123,61 @@
                         </xsd:annotation>
                     </xsd:element>
 
+                    <xsd:element name="preferredName" type="t:PolyStringType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                <p>
+                                    Preferred name of the user. This is the name that the user prefers
+                                    to use for display purposes. It does not replace legal-name attributes
+                                    such as given name, family name, or full name, and it is not intended
+                                    to be used as a login name, account identifier, or correlation identifier.
+                                </p>
+                                <p>
+                                    Examples:
+                                    <ul>
+                                        <li>Jack Smith</li>
+                                        <li>Liz Johnson</li>
+                                    </ul>
+                                </p>
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:displayName>UserType.preferredName</a:displayName>
+                                <a:displayOrder>105</a:displayOrder>
+                                <a:displayHint>emphasized</a:displayHint>
+                                <a:diagram>
+                                    <a:name>user-overview</a:name>
+                                    <a:inclusion>include</a:inclusion>
+                                </a:diagram>
+                                <a:help>UserType.preferredName.help</a:help>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+
+                    <xsd:element name="displayName" type="t:PolyStringType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                <p>
+                                    Effective visible name of the user for presentation-oriented display.
+                                    This property is intended to hold the user's preferred display value
+                                    for UI, reporting, and outbound provisioning scenarios where a visible
+                                    name is needed. It is distinct from the legal/full name and from login
+                                    or account identifiers.
+                                </p>
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:displayName>UserType.displayNameProperty</a:displayName>
+                                <a:displayOrder>106</a:displayOrder>
+                                <a:displayHint>emphasized</a:displayHint>
+                                <a:access>read</a:access>
+                                <a:diagram>
+                                    <a:name>user-overview</a:name>
+                                    <a:inclusion>include</a:inclusion>
+                                </a:diagram>
+                                <a:help>UserType.displayNameProperty.help</a:help>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+
                     <xsd:element name="givenName" type="t:PolyStringType" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
@@ -6636,7 +6691,7 @@
                         If set to true the script will be evaluated with null value as argument when the input is
                         changed from or to an empty value. This generally works well for most cases. It may be set to
                         false as an optimization.
-                        Note: default setting (true) for this property may be overridden in specific expression 
+                        Note: default setting (true) for this property may be overridden in specific expression
                         evaluators.
                     </xsd:documentation>
                 </xsd:annotation>
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
index 118f086c379..f6cdb148060 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
@@ -427,7 +427,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         Expression that can be used to return String value which describes user object returned by search.
-                        By default, `user.getFullName() + "(" + user.getName() + ")"` is used.
+                        By default, `user.getDisplayName() + " (" + user.getName() + ")"` is used.
 
                         DEPRECATED:
                         Use autocompleteConfiguration.
diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
index 5ae261ac512..66f94e4027f 100644
--- a/infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
+++ b/infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
@@ -47,6 +47,13 @@ public static void assertUserDefinition(PrismObjectDefinition<UserType> userDefi
         PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_FULL_NAME, SchemaConstants.T_POLY_STRING_TYPE, 0, 1);
         PrismAsserts.assertItemDefinitionDisplayName(userDefinition, UserType.F_FULL_NAME, "UserType.fullName");
         PrismAsserts.assertItemDefinitionDisplayOrder(userDefinition, UserType.F_FULL_NAME, 100);
+        PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_PREFERRED_NAME, SchemaConstants.T_POLY_STRING_TYPE, 0, 1);
+        PrismAsserts.assertItemDefinitionDisplayName(userDefinition, UserType.F_PREFERRED_NAME, "UserType.preferredName");
+        PrismAsserts.assertItemDefinitionDisplayOrder(userDefinition, UserType.F_PREFERRED_NAME, 105);
+        PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_DISPLAY_NAME, SchemaConstants.T_POLY_STRING_TYPE, 0, 1);
+        PrismAsserts.assertItemDefinitionDisplayName(userDefinition, UserType.F_DISPLAY_NAME, "UserType.displayNameProperty");
+        PrismAsserts.assertItemDefinitionDisplayOrder(userDefinition, UserType.F_DISPLAY_NAME, 106);
+        assertFalse("displayName is modifiable", userDefinition.findPropertyDefinition(UserType.F_DISPLAY_NAME).canModify());
         PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_GIVEN_NAME, PrismConstants.POLYSTRING_TYPE_QNAME, 0, 1);
         PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_FAMILY_NAME, PrismConstants.POLYSTRING_TYPE_QNAME, 0, 1);
         PrismAsserts.assertPropertyDefinition(userDefinition, UserType.F_ADDITIONAL_NAME, PrismConstants.POLYSTRING_TYPE_QNAME, 0, 1);
diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java
index 429c9e1bb27..814ecf67fa2 100644
--- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java
+++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java
@@ -70,6 +70,7 @@ public class DefaultColumnUtils {
                         new ColumnWrapper(UserType.F_NAME, true),
                         new ColumnWrapper(UserType.F_PERSONAL_NUMBER, true),
                         new ColumnWrapper(UserType.F_FULL_NAME, true),
+                        new ColumnWrapper(UserType.F_DISPLAY_NAME, true),
                         new ColumnWrapper(UserType.F_EMAIL_ADDRESS),
                         new ColumnWrapper(UserType.F_LINK_REF, "FocusType.accounts", DisplayValueType.NUMBER)))
                 .put(AbstractRoleType.class, Arrays.asList(
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Components.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Components.java
index e1ecf7a274d..f7328da91ea 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Components.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Components.java
@@ -24,6 +24,7 @@ public class Components {
     public static final String FOCUS_LIFECYCLE = "focusLifecycle";
     public static final String OBJECT_TEMPLATE_AFTER_ASSIGNMENTS = "objectTemplateAfterAssignments";
     public static final String FOCUS_CREDENTIALS = "focusCredentials";
+    public static final String FOCUS_DISPLAY_NAME = "focusDisplayName";
     public static final String FOCUS_POLICY_RULES = "focusPolicyRules";
     public static final String POLICY_RULE_COUNTERS = "policyRuleCounters";
     public static final String EXECUTION = "execution";
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java
index c712f4a8b20..c8985d13c73 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java
@@ -6,6 +6,8 @@
 
 package com.evolveum.midpoint.model.impl.lens.projector.focus;
 
+import java.util.Objects;
+
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.evolveum.midpoint.model.impl.lens.*;
@@ -17,10 +19,13 @@
 import com.evolveum.midpoint.model.impl.lens.projector.util.ProcessorExecution;
 import com.evolveum.midpoint.model.impl.lens.projector.util.ProcessorMethod;
 import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.prism.delta.PropertyDelta;
+import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.schema.cache.CacheConfigurationManager;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -195,6 +200,14 @@ public <AH extends AssignmentHolderType> void processFocus(
                         partialProcessingOptions::getFocusCredentials,
                         Projector.class, context, now, task, result);
 
+                // Maintain UserType.displayName (computed from preferredName/fullName)
+
+                medic.partialExecute(
+                        Components.FOCUS_DISPLAY_NAME, this,
+                        this::maintainUserDisplayName,
+                        () -> PartialProcessingTypeType.PROCESS,
+                        Projector.class, context, now, task, result);
+
                 // We need to evaluate this as a last step. We need to make sure we have all the
                 // focus deltas so we can properly trigger the rules.
 
@@ -248,6 +261,45 @@ public <AH extends AssignmentHolderType> void processFocus(
         LensUtil.checkContextSanity(context, "focus processing");
     }
 
+    @ProcessorMethod
+    private <AH extends AssignmentHolderType> void maintainUserDisplayName(
+            LensContext<AH> context, XMLGregorianCalendar now, Task task, OperationResult result)
+            throws SchemaException {
+        LensFocusContext<AH> focusContext = context.getFocusContext();
+        if (!focusContext.represents(UserType.class) || focusContext.isDelete()) {
+            return;
+        }
+
+        PrismObject<AH> objectNew = focusContext.getObjectNew();
+        if (objectNew == null) {
+            return;
+        }
+
+        UserType user = (UserType) objectNew.asObjectable();
+        String currentDisplayName = StringUtils.trimToNull(PolyString.getOrig(user.getDisplayName()));
+        String targetDisplayName = determineUserDisplayName(user);
+        if (Objects.equals(currentDisplayName, targetDisplayName)) {
+            return;
+        }
+
+        LOGGER.trace("Updating user displayName to {}", targetDisplayName);
+        PropertyDelta<?> displayNameDelta = targetDisplayName != null ?
+                prismContext.deltaFactory().property()
+                        .createModificationReplaceProperty(
+                                UserType.F_DISPLAY_NAME, focusContext.getObjectDefinition(), PolyString.fromOrig(targetDisplayName)) :
+                prismContext.deltaFactory().property()
+                        .createReplaceEmptyDelta(focusContext.getObjectDefinition(), UserType.F_DISPLAY_NAME);
+        focusContext.swallowToSecondaryDelta(displayNameDelta);
+    }
+
+    private String determineUserDisplayName(UserType user) {
+        String preferredName = StringUtils.trimToNull(PolyString.getOrig(user.getPreferredName()));
+        if (preferredName != null) {
+            return preferredName;
+        }
+        return StringUtils.trimToNull(PolyString.getOrig(user.getFullName()));
+    }
+
     ExpressionFactory getExpressionFactory() {
         return expressionFactory;
     }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
index 60c713fe761..ee22e1be382 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
@@ -1069,7 +1069,7 @@ private NameImpl createVisualizationName(PrismObject<? extends ObjectType> objec
         ObjectType objectType = object.asObjectable();
         name.setDescription(objectType.getDescription());
         if (objectType instanceof UserType) {
-            name.setDisplayName(getOrig(((UserType) objectType).getFullName()));
+            name.setDisplayName(getOrig(((UserType) objectType).getDisplayName()));
         } else if (objectType instanceof AbstractRoleType) {
             name.setDisplayName(getOrig(((AbstractRoleType) objectType).getDisplayName()));
         }
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
index d0a84d42678..a48619c9773 100644
--- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
+++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
@@ -1096,6 +1096,7 @@ public void test500ReconcileGuybrushDummy() throws Exception {
                                 PATH_ACTIVATION_EFFECTIVE_STATUS,
                                 PATH_ACTIVATION_ENABLE_TIMESTAMP,
                                 PATH_PASSWORD_METADATA,
+                                UserType.F_DISPLAY_NAME,
                                 UserType.F_ITERATION,
                                 UserType.F_ITERATION_TOKEN),
                         (a, b) -> a.equivalent(b)));
@@ -1185,7 +1186,7 @@ private void assertOriginWithSideEffectChanges(ObjectDelta<UserType> delta, Orig
                 PrismAsserts.assertOrigin(modification, OriginType.USER_POLICY);
                 iterator.remove();
             }
-            if (modification.getPath().containsNameExactly(InfraItemName.METADATA)) {
+            if (modification.getPath().containsNameExactly(InfraItemName.METADATA) || firstName.equals(UserType.F_DISPLAY_NAME)) {
                 iterator.remove();
             }
         }
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
index abda5b32de5..7c5a6c4cc1f 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
@@ -950,7 +950,7 @@ public void test160ModifyUserGivenNameAgain() throws Exception {
         ObjectDeltaOperation<?> objectDeltaOperation =
                 dummyAuditService.getExecutionDelta(0, ChangeType.MODIFY, UserType.class);
         assertEquals("unexpected number of modifications in audited delta",
-                10, objectDeltaOperation.getObjectDelta().getModifications().size()); // givenName + badLuck + modifyTimestamp
+                11, objectDeltaOperation.getObjectDelta().getModifications().size()); // givenName + displayName + badLuck + modifyTimestamp
         PropertyDelta<?> badLuckDelta = objectDeltaOperation.getObjectDelta().findPropertyDelta(
                 ItemPath.create(UserType.F_EXTENSION, PIRACY_BAD_LUCK));
         assertNotNull("badLuck delta was not found", badLuckDelta);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
index d1d642ce681..cf2c09fb935 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
@@ -1115,9 +1115,11 @@ private void jackRenameSimulated(String toName, String toFullName, Task task, Op
                         .assertModifiedExclusive(
                                 UserType.F_NAME,
                                 UserType.F_FULL_NAME,
+                                UserType.F_DISPLAY_NAME,
                                 InfraItemName.METADATA)
                         .assertPolyStringModification(UserType.F_NAME, "jack", toName)
                         .assertPolyStringModification(UserType.F_FULL_NAME, "Jack Sparrow", toFullName)
+                        .assertPolyStringModification(UserType.F_DISPLAY_NAME, "Jack Sparrow", toFullName)
                     .end()
                 .end()
                 .by().objectType(ShadowType.class).changeType(ChangeType.MODIFY).resourceOid(RESOURCE_DUMMY_OID).find()
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
index d5ebd7ed784..f40b3e6ddfa 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
@@ -1334,7 +1334,7 @@ public void test225PreviewWithHiddenProjections() throws Exception {
                 .summarySecondaryDelta()
                 .display()
                 .assertModify()
-                .assertModifications(1)
+                .assertModifications(2)
                 .end()
                 .end()
                 .projectionContexts()
diff --git a/model/model-intest/src/test/resources/common/user-administrator.xml b/model/model-intest/src/test/resources/common/user-administrator.xml
index 4196346699b..4fdc30fc505 100644
--- a/model/model-intest/src/test/resources/common/user-administrator.xml
+++ b/model/model-intest/src/test/resources/common/user-administrator.xml
@@ -12,6 +12,7 @@
     <name>administrator</name>
     <indestructible>true</indestructible>
     <fullName>midPoint Administrator</fullName>
+    <displayName>midPoint Administrator</displayName>
     <givenName>midPoint</givenName>
     <familyName>Administrator</familyName>
     <emailAddress>administrator@evolveum.com</emailAddress>
diff --git a/model/model-intest/src/test/resources/common/user-barbossa.xml b/model/model-intest/src/test/resources/common/user-barbossa.xml
index 45cf145cc79..981d8c6a0c7 100644
--- a/model/model-intest/src/test/resources/common/user-barbossa.xml
+++ b/model/model-intest/src/test/resources/common/user-barbossa.xml
@@ -20,6 +20,7 @@
     </activation>
 
     <fullName>Hector Barbossa</fullName>
+    <displayName>Hector Barbossa</displayName>
     <givenName>Hector</givenName>
     <familyName>Barbossa</familyName>
     <locality>Caribbean</locality>
diff --git a/model/model-intest/src/test/resources/common/user-capsize.xml b/model/model-intest/src/test/resources/common/user-capsize.xml
index 99184243f7b..398614b0047 100644
--- a/model/model-intest/src/test/resources/common/user-capsize.xml
+++ b/model/model-intest/src/test/resources/common/user-capsize.xml
@@ -38,6 +38,7 @@
     </activation>
 
     <fullName>Kate Capsize</fullName>
+    <displayName>Kate Capsize</displayName>
     <givenName>Kate</givenName>
     <familyName>Capsize</familyName>
     <honorificPrefix>Captain</honorificPrefix>
diff --git a/model/model-intest/src/test/resources/common/user-drake.xml b/model/model-intest/src/test/resources/common/user-drake.xml
index c32c54352dc..a39e3cf22c5 100644
--- a/model/model-intest/src/test/resources/common/user-drake.xml
+++ b/model/model-intest/src/test/resources/common/user-drake.xml
@@ -17,6 +17,7 @@
         <piracy:ship xsi:type="xsd:string">Golden Hind</piracy:ship>
     </extension>
     <fullName>Francis Drake</fullName>
+    <displayName>Francis Drake</displayName>
     <givenName>Fancis</givenName>
     <familyName>Drake</familyName>
     <honorificPrefix>Sir</honorificPrefix>
diff --git a/model/model-intest/src/test/resources/common/user-elaine.xml b/model/model-intest/src/test/resources/common/user-elaine.xml
index cbd7114a9ef..c1a7ab8fbc9 100644
--- a/model/model-intest/src/test/resources/common/user-elaine.xml
+++ b/model/model-intest/src/test/resources/common/user-elaine.xml
@@ -37,6 +37,7 @@
     <linkRef oid="c0c010c0-d34d-b33f-f00d-22220204000e" type="c:ShadowType"/>
 
     <fullName>Elaine Marley</fullName>
+    <displayName>Elaine Marley</displayName>
     <givenName>Elaine</givenName>
     <familyName>Marley</familyName>
     <locality>Melee Island</locality>
diff --git a/model/model-intest/src/test/resources/common/user-guybrush.xml b/model/model-intest/src/test/resources/common/user-guybrush.xml
index 5882c234e3a..e746a4c7b1f 100644
--- a/model/model-intest/src/test/resources/common/user-guybrush.xml
+++ b/model/model-intest/src/test/resources/common/user-guybrush.xml
@@ -17,6 +17,7 @@
     <linkRef oid="22226666-2200-6666-6666-444400004444" type="c:ShadowType"/>
 
     <fullName>Guybrush Threepwood</fullName>
+    <displayName>Guybrush Threepwood</displayName>
     <givenName>Guybrush</givenName>
     <familyName>Threepwood</familyName>
     <locality>Melee Island</locality>
diff --git a/model/model-intest/src/test/resources/common/user-herman.xml b/model/model-intest/src/test/resources/common/user-herman.xml
index 4a221564df0..38e0b98b76e 100644
--- a/model/model-intest/src/test/resources/common/user-herman.xml
+++ b/model/model-intest/src/test/resources/common/user-herman.xml
@@ -20,6 +20,7 @@
     </activation>
 
     <fullName>Herman Toothrot</fullName>
+    <displayName>Herman Toothrot</displayName>
     <givenName>Herman</givenName>
     <familyName>Toothrot</familyName>
     <locality>Monkey Island</locality>
diff --git a/model/model-intest/src/test/resources/common/user-jack.xml b/model/model-intest/src/test/resources/common/user-jack.xml
index d08603d52da..745ef2a1a6b 100644
--- a/model/model-intest/src/test/resources/common/user-jack.xml
+++ b/model/model-intest/src/test/resources/common/user-jack.xml
@@ -22,6 +22,7 @@
         <piracy:badLuck>0</piracy:badLuck>
     </extension>
     <fullName>Jack Sparrow</fullName>
+    <displayName>Jack Sparrow</displayName>
     <givenName>Jack</givenName>
     <familyName>Sparrow</familyName>
     <additionalName>Jackie</additionalName>
diff --git a/model/model-intest/src/test/resources/common/user-nooid.xml b/model/model-intest/src/test/resources/common/user-nooid.xml
index 44f7028747a..123848de81d 100644
--- a/model/model-intest/src/test/resources/common/user-nooid.xml
+++ b/model/model-intest/src/test/resources/common/user-nooid.xml
@@ -15,6 +15,7 @@
     <name>nooid</name>
     <description>User with No OID</description>
     <fullName>Neville Nooid</fullName>
+    <displayName>Neville Nooid</displayName>
     <givenName>Neville</givenName>
     <familyName>Nooid</familyName>
 </user>
diff --git a/model/model-intest/src/test/resources/common/user-three-headed-monkey.xml b/model/model-intest/src/test/resources/common/user-three-headed-monkey.xml
index 3f8f274d4ac..3341b3c5229 100644
--- a/model/model-intest/src/test/resources/common/user-three-headed-monkey.xml
+++ b/model/model-intest/src/test/resources/common/user-three-headed-monkey.xml
@@ -14,5 +14,6 @@
         xmlns:piracy='http://midpoint.evolveum.com/xml/ns/samples/piracy'>
     <name>monkey</name>
     <fullName>Three-Headed Monkey</fullName>
+    <displayName>Three-Headed Monkey</displayName>
     <familyName>Monkey</familyName>
 </user>
diff --git a/model/model-intest/src/test/resources/preview/user-rogers.xml b/model/model-intest/src/test/resources/preview/user-rogers.xml
index 9f889264d0c..ac0d3f75814 100644
--- a/model/model-intest/src/test/resources/preview/user-rogers.xml
+++ b/model/model-intest/src/test/resources/preview/user-rogers.xml
@@ -21,6 +21,7 @@
     </activation>
 
     <fullName>Rum Rogers Sr.</fullName>
+    <displayName>Rum Rogers Sr.</displayName>
     <givenName>Rum</givenName>
     <familyName>Rogers</familyName>
 
diff --git a/model/model-intest/src/test/resources/security/role-limited-user-admin.xml b/model/model-intest/src/test/resources/security/role-limited-user-admin.xml
index d66983224bb..6ffc2eec209 100644
--- a/model/model-intest/src/test/resources/security/role-limited-user-admin.xml
+++ b/model/model-intest/src/test/resources/security/role-limited-user-admin.xml
@@ -29,6 +29,7 @@
         <item>description</item>
         <item>givenName</item>
         <item>fullName</item>
+        <item>displayName</item>
         <item>familyName</item>
         <item>title</item>
         <item>locality</item>
@@ -49,6 +50,7 @@
         <item>description</item>
         <item>givenName</item>
         <item>fullName</item>
+        <item>displayName</item>
         <item>nickName</item> <!-- Set by user template to modifier OID -->
         <item>familyName</item>
         <item>title</item>
diff --git a/model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml b/model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
index 9f473d0ab59..81cb72ed41b 100644
--- a/model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-get-search-some-modify-some-user.xml
@@ -42,6 +42,7 @@
             </filter>
         </object>
         <item>fullName</item>
+        <item>displayName</item>
         <item>additionalName</item>
         <item>description</item>
         <item>activation/validFrom</item>
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
index c7f632722c8..96f8bb188c7 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user-partial.xml
@@ -36,6 +36,7 @@
             </filter>
         </object>
         <item>fullName</item>
+        <item>displayName</item>
         <item>description</item>
     </authorization>
     <authorization>
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
index 18c5da7e105..054140425d4 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml
@@ -36,6 +36,7 @@
             </filter>
         </object>
         <item>fullName</item>
+        <item>displayName</item>
         <item>description</item>
     </authorization>
 </role>
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
index 87af9ef44c3..f86d1bae4b5 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
@@ -17,6 +17,7 @@
         <name>AUTZreadAllModify2</name>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#modify</action>
         <item>c:fullName</item>
+        <item>c:displayName</item>
         <item>c:description</item>
         <item>extension/ship</item>
         <item>extension/weapon</item>
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-fullname.xml b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-fullname.xml
index 1baf5595e0b..8b9ac935eff 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-fullname.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-fullname.xml
@@ -68,6 +68,7 @@
         </object>
         <item>givenName</item>
         <item>c:fullName</item> <!-- fullName IS here. -->
+        <item>c:displayName</item>
         <item>c:additionalName</item>
         <item>c:description</item>
         <item>c:organization</item> <!-- Not in request autz -->
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml
index 65874d57485..f001cfeccfc 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml
@@ -45,6 +45,7 @@
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#modify</action>
         <phase>execution</phase>
         <item>c:fullName</item>
+        <item>c:displayName</item>
         <item>c:additionalName</item>
         <item>c:description</item>
         <item>c:organization</item> <!-- Not in request autz -->
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
index 0c192d9d96f..c70ce8b0a33 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-user.xml
@@ -40,6 +40,7 @@
             </filter>
         </object>
         <item>fullName</item>
+        <item>displayName</item>
         <item>additionalName</item>
         <item>description</item>
         <item>activation/validFrom</item>
diff --git a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml
index cfd3e3d30b5..609dfbaa512 100644
--- a/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml
+++ b/model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml
@@ -21,6 +21,7 @@
         <name>modify-some</name>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#modify</action>
         <item>fullName</item>
+        <item>displayName</item>
         <item>additionalName</item>
         <item>description</item>
         <item>activation/validFrom</item>
diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
index 3d50cdb593b..930a6ec69f0 100644
--- a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
+++ b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -3878,6 +3878,9 @@ protected <F extends FocusType> void assertSideEffectiveDeltasOnly(String desc,
         if (focusDelta.findItemDelta(FocusType.F_ITERATION_TOKEN) != null) {
             expectedModifications++;
         }
+        if (focusDelta.findItemDelta(UserType.F_DISPLAY_NAME) != null) {
+            expectedModifications++;
+        }
         assertEquals("Unexpected modifications in " + desc + ": " + focusDelta, expectedModifications, focusDelta.getModifications().size());
     }
 
@@ -3924,6 +3927,9 @@ protected <F extends FocusType> void assertEffectualDeltas(
         if (focusDelta.findItemDelta(FocusType.F_ITERATION_TOKEN) != null) {
             expectedModifications++;
         }
+        if (focusDelta.findItemDelta(UserType.F_DISPLAY_NAME) != null) {
+            expectedModifications++;
+        }
         assertEquals("Unexpected modifications in " + desc + ": " + focusDelta, expectedModifications, focusDelta.getModifications().size());
     }
 
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/BaseEventImpl.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/BaseEventImpl.java
index c94625ab3fb..68eab8d056d 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/BaseEventImpl.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/BaseEventImpl.java
@@ -141,7 +141,7 @@ private PolyStringType getDisplayName(ObjectType object) {
             return null;
         }
         if (object instanceof UserType) {
-            return ((UserType) object).getFullName();
+            return ((UserType) object).getDisplayName();
         } else if (object instanceof AbstractRoleType) {
             return ((AbstractRoleType) object).getDisplayName();
         } else {
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/ValueFormatter.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/ValueFormatter.java
index f4014043b31..60150ce7f7c 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/ValueFormatter.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/ValueFormatter.java
@@ -19,6 +19,7 @@
 import com.evolveum.midpoint.schema.util.ShadowUtil;
 import com.evolveum.midpoint.util.LocalizableMessage;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -327,11 +328,11 @@ public String formatUserName(ObjectReferenceType ref, OperationResult result) {
     }
 
     public String formatUserName(UserType user, String oid) {
-        if (user == null || (user.getName() == null && user.getFullName() == null)) {
+        if (user == null || (user.getName() == null && user.getDisplayName() == null)) {
             return oid;
         }
-        if (user.getFullName() != null) {
-            return getOrig(user.getFullName()) + " (" + getOrig(user.getName()) + ")";
+        if (user.getDisplayName() != null) {
+            return getOrig(user.getDisplayName()) + " (" + getOrig(user.getName()) + ")";
         } else {
             return getOrig(user.getName());
         }
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
index b71e7627883..bc13e9cdaa6 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
@@ -473,8 +473,7 @@ protected String getContentType() {
      * . quick
      * . safe - it should not make any assumptions about event content that would cause it to throw an exception
      * . filter out events that obviously do not match the notifier - e.g. simpleUserNotifier should ensure that
-     * the focus type is really UserType; this allows nested filters to assume existence of
-     * e.g. requestee.fullName element.
+     * the focus type is really UserType; this allows nested filters to assume existence of user-specific properties.
      */
     protected boolean quickCheckApplicability(
             ConfigurationItem<? extends N> notifierConfig,
@@ -680,7 +679,7 @@ String formatRequester(E event, OperationResult result) {
         ObjectType requester = requesterRef.resolveObjectType(result, false);
         String name = PolyString.getOrig(requester.getName());
         if (requester instanceof UserType) {
-            return name + " (" + PolyString.getOrig(((UserType) requester).getFullName()) + ")";
+            return name + " (" + PolyString.getOrig(((UserType) requester).getDisplayName()) + ")";
         } else {
             return name;
         }
@@ -693,7 +692,7 @@ void addRequesterAndChannelInformation(StringBuilder body, Event event, Operatio
                 ObjectType requester = event.getRequester().resolveObjectType(result, false);
                 if (requester instanceof UserType) {
                     UserType requesterUser = (UserType) requester;
-                    body.append(requesterUser.getFullName()).append(" (").append(requester.getName()).append(")");
+                    body.append(requesterUser.getDisplayName()).append(" (").append(requester.getName()).append(")");
                 } else {
                     body.append(ObjectTypeUtil.toShortString(requester));
                 }
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
index 1630e8110f1..0b1d8d3b4ec 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
@@ -150,8 +150,8 @@ private String getRequestorDisplayName(ObjectType requester) {
             name = requester.asPrismObject().getDisplayName();
         }
         if (requester instanceof UserType) {
-            if (((UserType) requester).getFullName() != null) {
-                name = ((UserType) requester).getFullName().getOrig();
+            if (((UserType) requester).getDisplayName() != null) {
+                name = ((UserType) requester).getDisplayName().getOrig();
             }
         }
         return name;
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
index bf5fa92ddad..fa8906de481 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
@@ -123,7 +123,7 @@ protected String getBody(ConfigurationItem<? extends SimpleFocalObjectNotifierTy
         AssignmentHolderType focus = focusObject.asObjectable();
         String oid = focusContext.getOid();
 
-        String fullName = emptyIfNull(getFullName(focus));
+        String displayName = emptyIfNull(getDisplayName(focus));
 
         ObjectDelta<AssignmentHolderType> delta = ObjectDeltaCollectionsUtil.summarize(event.getFocusDeltas());
 
@@ -133,7 +133,7 @@ protected String getBody(ConfigurationItem<? extends SimpleFocalObjectNotifierTy
         String attemptedTo = event.isSuccess() ? "" : "(attempted to be) ";
 
         body.append("Notification about ").append(typeNameLower).append("-related operation (status: ").append(status).append(")\n\n");
-        body.append(typeName).append(": ").append(fullName).append(" (").append(focus.getName()).append(", oid ").append(oid).append(")\n");
+        body.append(typeName).append(": ").append(displayName).append(" (").append(focus.getName()).append(", oid ").append(oid).append(")\n");
         body.append("Notification created on: ").append(new Date()).append("\n\n");
 
         boolean watchAuxiliaryAttributes = isWatchAuxiliaryAttributes(configuration.value());
@@ -164,16 +164,16 @@ protected String getBody(ConfigurationItem<? extends SimpleFocalObjectNotifierTy
     }
 
     @Nullable
-    private String getFullName(AssignmentHolderType focus) {
-        String fullName;
+    private String getDisplayName(AssignmentHolderType focus) {
+        String displayName;
         if (focus instanceof UserType) {
-            fullName = PolyString.getOrig(((UserType) focus).getFullName());
+            displayName = PolyString.getOrig(((UserType) focus).getDisplayName());
         } else if (focus instanceof AbstractRoleType) {
-            fullName = PolyString.getOrig(((AbstractRoleType) focus).getDisplayName());
+            displayName = PolyString.getOrig(((AbstractRoleType) focus).getDisplayName());
         } else {
-            fullName = "";          // TODO
+            displayName = "";          // TODO
         }
-        return fullName;
+        return displayName;
     }
 
     @Override
diff --git a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java
index 5ebf83ca91b..d5e9c5cd9e7 100644
--- a/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java
+++ b/model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java
@@ -87,7 +87,7 @@ protected String getBody(
             FocusType owner = taskOwner.asObjectable();
             body.append("Task owner: ");
             if (owner instanceof UserType) {
-                body.append(((UserType)owner).getFullName()).append(" (").append(owner.getName()).append(")");
+                body.append(PolyString.getOrig(((UserType) owner).getDisplayName())).append(" (").append(owner.getName()).append(")");
             } else {
                 body.append(owner.getName());
             }
diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportExportClassic.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportExportClassic.java
index d2ecfa0ea3b..9e041d197ad 100644
--- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportExportClassic.java
+++ b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportExportClassic.java
@@ -118,7 +118,7 @@ public void test104AuditCollectionReportEmpty() throws Exception {
 
     @Test
     public void test110ObjectCollectionReportWithDefaultColumn() throws Exception {
-        testClassicExport(REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN, 54, 5, null);
+        testClassicExport(REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN, 54, 6, null);
     }
 
     @Test
@@ -145,12 +145,12 @@ public void test114ObjectCollectionReportWithFilterAndBasicCollection() throws E
 
     @Test
     public void test115ObjectCollectionReportWithCondition() throws Exception {
-        testClassicExport(REPORT_OBJECT_COLLECTION_WITH_CONDITION, 2, 5, null);
+        testClassicExport(REPORT_OBJECT_COLLECTION_WITH_CONDITION, 2, 6, null);
     }
 
     @Test
     public void test116ObjectCollectionEmptyReport() throws Exception {
-        testClassicExport(REPORT_OBJECT_COLLECTION_EMPTY, 1, 5, null);
+        testClassicExport(REPORT_OBJECT_COLLECTION_EMPTY, 1, 6, null);
     }
 
     @Test
@@ -171,7 +171,7 @@ public void test119ObjectCollectionWithSubreportParamReport() throws Exception {
 
     @Test
     public void test120RunMidpointUsers() throws Exception {
-        testClassicExport(REPORT_USER_LIST, 54, 5, null);
+        testClassicExport(REPORT_USER_LIST, 54, 6, null);
     }
 
     @Test
@@ -180,7 +180,7 @@ public void test121RunMidpointUsersScript() throws Exception {
             displaySkip();
             return;
         }
-        testClassicExport(REPORT_USER_LIST_SCRIPT, 54, 5, null);
+        testClassicExport(REPORT_USER_LIST_SCRIPT, 54, 6, null);
         File targetFile = new File(MidPointTestConstants.TARGET_DIR_PATH, "report-users");
         assertTrue("Target file is not there", targetFile.exists());
     }
diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvSimulationReport.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvSimulationReport.java
index 46b7eadf9ee..14f68c18f01 100644
--- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvSimulationReport.java
+++ b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvSimulationReport.java
@@ -779,6 +779,8 @@ public void test150ModifyUserWithAssignedAccount() throws Exception {
         UserType user = new UserType()
                 .name(userName)
                 .fullName("Jack Sparrow")
+                .preferredName("Jack Sparrow")
+                .displayName("Jack Sparrow")
                 .assignment(RESOURCE_DUMMY_OUTBOUND.assignmentWithConstructionOf(null, null))
                 .assignment(ARCHETYPE_BLUE.assignmentTo());
         addObject(user.asPrismObject(), task, result);
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
index 35e61a6f70d..4ac65a538b4 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
@@ -355,7 +355,7 @@ private void executeAssignRole1(
 
         String userOid = userObject.oid;
         PrismObject<UserType> user = getUser(userOid);
-        String userDisplayName = user.asObjectable().getFullName() + " (" + user.asObjectable().getName() + ")";
+        String userDisplayName = user.asObjectable().getDisplayName() + " (" + user.asObjectable().getName() + ")";
 
         TestObject<RoleType> roleObject = getRole(1);
 
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
index 490cdbd7ad4..757104a99e4 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
@@ -472,6 +472,8 @@ public void test610ModifyAssignmentOfRole29() throws Exception {
         ObjectDelta<UserType> delta0 = prismContext.deltaFor(UserType.class)
                 .item(UserType.F_FULL_NAME)
                 .replace(PolyString.fromOrig("new full name"))
+                .item(UserType.F_DISPLAY_NAME)
+                .replace(PolyString.fromOrig("new full name"))
                 .asObjectDelta(USER_JACK.oid);
 
         // +THEN
@@ -595,6 +597,8 @@ public void test620ModifyAssignmentOfRole29Immediate() throws Exception {
         ObjectDelta<UserType> delta0 = prismContext.deltaFor(UserType.class)
                 .item(UserType.F_FULL_NAME)
                 .replace(PolyString.fromOrig("new full name 2"))
+                .item(UserType.F_DISPLAY_NAME)
+                .replace(PolyString.fromOrig("new full name 2"))
                 .asObjectDelta(USER_JACK.oid);
 
         // +THEN
@@ -717,6 +721,8 @@ public void test700AssignRole28() throws Exception {
         ObjectDelta<UserType> delta0 = prismContext.deltaFor(UserType.class)
                 .item(UserType.F_FULL_NAME)
                 .replace(PolyString.fromOrig("new full name 3"))
+                .item(UserType.F_DISPLAY_NAME)
+                .replace(PolyString.fromOrig("new full name 3"))
                 .asObjectDelta(USER_JACK.oid);
 
         PrismObject<UserType> jackBefore = getUser(USER_JACK.oid);
@@ -829,6 +835,8 @@ public void test710ModifyAssignmentOfRole28() throws Exception {
         ObjectDelta<UserType> delta0 = prismContext.deltaFor(UserType.class)
                 .item(UserType.F_FULL_NAME)
                 .replace(PolyString.fromOrig("new full name 4"))
+                .item(UserType.F_DISPLAY_NAME)
+                .replace(PolyString.fromOrig("new full name 4"))
                 .asObjectDelta(USER_JACK.oid);
 
         // +THEN
@@ -934,6 +942,8 @@ public void test720UnassignRole28() throws Exception {
         ObjectDelta<UserType> delta0 = prismContext.deltaFor(UserType.class)
                 .item(UserType.F_FULL_NAME)
                 .replace(PolyString.fromOrig("new full name 5"))
+                .item(UserType.F_DISPLAY_NAME)
+                .replace(PolyString.fromOrig("new full name 5"))
                 .asObjectDelta(USER_JACK.oid);
 
         // +THEN
diff --git a/model/workflow-impl/src/test/resources/assignments/user-draft.xml b/model/workflow-impl/src/test/resources/assignments/user-draft.xml
index 903d4c9220f..a0a9a7e971e 100644
--- a/model/workflow-impl/src/test/resources/assignments/user-draft.xml
+++ b/model/workflow-impl/src/test/resources/assignments/user-draft.xml
@@ -8,4 +8,5 @@
     <name>draft</name>
     <lifecycleState>draft</lifecycleState>
     <fullName>Draft</fullName>
+    <displayName>Draft</displayName>
 </user>
diff --git a/release-notes.adoc b/release-notes.adoc
index 63072c115ff..cf1dbe37ebf 100644
--- a/release-notes.adoc
+++ b/release-notes.adoc
@@ -53,6 +53,7 @@ Overall, midPoint 4.10 opens up the world of identity management and governance
 * bug:MID-11036[] Implemented export to XLSX.
 * bug:MID-10918[] Improved audit record for skipped approval stage.
 * bug:MID-9476[] Improved Search Box in Object Collection View.
+* bug:MID-8802[] Added displayName and preferredName to UserType.
 
 === Major Bugfixes
 
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
index cfedcb621a1..f81da93266a 100644
--- a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
+++ b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
@@ -38,7 +38,7 @@ public class SqaleUtils {
      */
     public static final String SCHEMA_AUDIT_CHANGE_NUMBER = "schemaAuditChangeNumber";
 
-    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 57;
+    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 58;
 
     public static final int CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER = 12;
 
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java
index b6bf031fcf9..8f12c3de4a6 100644
--- a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java
+++ b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java
@@ -15,6 +15,8 @@ public class MUser extends MFocus {
 
     public String additionalNameOrig;
     public String additionalNameNorm;
+    public String displayNameOrig;
+    public String displayNameNorm;
     public String employeeNumber;
     public String familyNameOrig;
     public String familyNameNorm;
@@ -29,6 +31,8 @@ public class MUser extends MFocus {
     public String nickNameOrig;
     public String nickNameNorm;
     public String personalNumber;
+    public String preferredNameOrig;
+    public String preferredNameNorm;
     public String titleOrig;
     public String titleNorm;
     public Jsonb organizations;
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java
index 8a2e1d9ec71..c63db4f04de 100644
--- a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java
+++ b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java
@@ -29,6 +29,10 @@ public class QUser extends QFocus<MUser> {
             ColumnMetadata.named("additionalNameOrig").ofType(Types.VARCHAR);
     public static final ColumnMetadata ADDITIONAL_NAME_NORM =
             ColumnMetadata.named("additionalNameNorm").ofType(Types.VARCHAR);
+    public static final ColumnMetadata DISPLAY_NAME_ORIG =
+            ColumnMetadata.named("displayNameOrig").ofType(Types.VARCHAR);
+    public static final ColumnMetadata DISPLAY_NAME_NORM =
+            ColumnMetadata.named("displayNameNorm").ofType(Types.VARCHAR);
     public static final ColumnMetadata EMPLOYEE_NUMBER =
             ColumnMetadata.named("employeeNumber").ofType(Types.VARCHAR);
     public static final ColumnMetadata FAMILY_NAME_ORIG =
@@ -55,6 +59,10 @@ public class QUser extends QFocus<MUser> {
             ColumnMetadata.named("nickNameOrig").ofType(Types.VARCHAR);
     public static final ColumnMetadata NICK_NAME_NORM =
             ColumnMetadata.named("nickNameNorm").ofType(Types.VARCHAR);
+    public static final ColumnMetadata PREFERRED_NAME_ORIG =
+            ColumnMetadata.named("preferredNameOrig").ofType(Types.VARCHAR);
+    public static final ColumnMetadata PREFERRED_NAME_NORM =
+            ColumnMetadata.named("preferredNameNorm").ofType(Types.VARCHAR);
     public static final ColumnMetadata TITLE_ORIG =
             ColumnMetadata.named("titleOrig").ofType(Types.VARCHAR);
     public static final ColumnMetadata TITLE_NORM =
@@ -67,6 +75,8 @@ public class QUser extends QFocus<MUser> {
 
     public final StringPath additionalNameOrig = createString("additionalNameOrig", ADDITIONAL_NAME_ORIG);
     public final StringPath additionalNameNorm = createString("additionalNameNorm", ADDITIONAL_NAME_NORM);
+    public final StringPath displayNameOrig = createString("displayNameOrig", DISPLAY_NAME_ORIG);
+    public final StringPath displayNameNorm = createString("displayNameNorm", DISPLAY_NAME_NORM);
     public final StringPath employeeNumber = createString("employeeNumber", EMPLOYEE_NUMBER);
     public final StringPath familyNameOrig = createString("familyNameOrig", FAMILY_NAME_ORIG);
     public final StringPath familyNameNorm = createString("familyNameNorm", FAMILY_NAME_NORM);
@@ -80,6 +90,8 @@ public class QUser extends QFocus<MUser> {
     public final StringPath honorificSuffixNorm = createString("honorificSuffixNorm", HONORIFIC_SUFFIX_NORM);
     public final StringPath nickNameOrig = createString("nickNameOrig", NICK_NAME_ORIG);
     public final StringPath nickNameNorm = createString("nickNameNorm", NICK_NAME_NORM);
+    public final StringPath preferredNameOrig = createString("preferredNameOrig", PREFERRED_NAME_ORIG);
+    public final StringPath preferredNameNorm = createString("preferredNameNorm", PREFERRED_NAME_NORM);
     public final StringPath titleOrig = createString("titleOrig", TITLE_ORIG);
     public final StringPath titleNorm = createString("titleNorm", TITLE_NORM);
     public final JsonbPath organizations =
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java
index 2a70552e449..a2590835385 100644
--- a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java
+++ b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java
@@ -44,6 +44,8 @@ private QUserMapping(@NotNull SqaleRepoContext repositoryContext) {
 
         addItemMapping(F_ADDITIONAL_NAME, polyStringMapper(
                 q -> q.additionalNameOrig, q -> q.additionalNameNorm));
+        addItemMapping(F_DISPLAY_NAME, polyStringMapper(
+                q -> q.displayNameOrig, q -> q.displayNameNorm));
         addItemMapping(F_EMPLOYEE_NUMBER, stringMapper(q -> q.employeeNumber));
         addItemMapping(F_PERSONAL_NUMBER, stringMapper(q -> q.personalNumber));
         addItemMapping(F_FAMILY_NAME, polyStringMapper(
@@ -58,6 +60,8 @@ private QUserMapping(@NotNull SqaleRepoContext repositoryContext) {
                 q -> q.honorificSuffixOrig, q -> q.honorificSuffixNorm));
         addItemMapping(F_NICK_NAME, polyStringMapper(
                 q -> q.nickNameOrig, q -> q.nickNameNorm));
+        addItemMapping(F_PREFERRED_NAME, polyStringMapper(
+                q -> q.preferredNameOrig, q -> q.preferredNameNorm));
         addItemMapping(F_TITLE, polyStringMapper(
                 q -> q.titleOrig, q -> q.titleNorm));
         addItemMapping(F_ORGANIZATION, multiPolyStringMapper(q -> q.organizations));
@@ -81,6 +85,8 @@ public MUser newRowObject() {
 
         setPolyString(user.getAdditionalName(),
                 o -> row.additionalNameOrig = o, n -> row.additionalNameNorm = n);
+        setPolyString(user.getDisplayName(),
+                o -> row.displayNameOrig = o, n -> row.displayNameNorm = n);
         row.employeeNumber = user.getEmployeeNumber();
         row.personalNumber = user.getPersonalNumber();
         setPolyString(user.getFamilyName(),
@@ -92,6 +98,8 @@ public MUser newRowObject() {
         setPolyString(user.getHonorificSuffix(),
                 o -> row.honorificSuffixOrig = o, n -> row.honorificSuffixNorm = n);
         setPolyString(user.getNickName(), o -> row.nickNameOrig = o, n -> row.nickNameNorm = n);
+        setPolyString(user.getPreferredName(),
+                o -> row.preferredNameOrig = o, n -> row.preferredNameNorm = n);
         setPolyString(user.getTitle(), o -> row.titleOrig = o, n -> row.titleNorm = n);
         row.organizations = JsonbUtils.polyStringTypesToJsonb(user.getOrganization());
         row.organizationUnits = JsonbUtils.polyStringTypesToJsonb(user.getOrganizationalUnit());
diff --git a/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java b/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
index b859f0dd3f8..d0c9507d252 100644
--- a/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
+++ b/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
@@ -2003,6 +2003,7 @@ public void test825User() throws Exception {
         UserType user = new UserType()
                 .name(objectName)
                 .additionalName("additional-name")
+                .displayName("display-name")
                 .employeeNumber("3")
                 .familyName("family-name")
                 .fullName("full-name")
@@ -2010,6 +2011,7 @@ public void test825User() throws Exception {
                 .honorificPrefix("honorific-prefix")
                 .honorificSuffix("honorific-suffix")
                 .nickName("nick-name")
+                .preferredName("preferred-name")
                 .title("title")
                 .organization("org-1")
                 .organization("org-2")
@@ -2027,6 +2029,8 @@ public void test825User() throws Exception {
         // all items from MUser
         assertThat(row.additionalNameOrig).isEqualTo("additional-name");
         assertThat(row.additionalNameNorm).isEqualTo("additionalname");
+        assertThat(row.displayNameOrig).isEqualTo("display-name");
+        assertThat(row.displayNameNorm).isEqualTo("displayname");
         assertThat(row.employeeNumber).isEqualTo("3");
         assertThat(row.familyNameOrig).isEqualTo("family-name");
         assertThat(row.familyNameNorm).isEqualTo("familyname");
@@ -2040,6 +2044,8 @@ public void test825User() throws Exception {
         assertThat(row.honorificSuffixNorm).isEqualTo("honorificsuffix");
         assertThat(row.nickNameOrig).isEqualTo("nick-name");
         assertThat(row.nickNameNorm).isEqualTo("nickname");
+        assertThat(row.preferredNameOrig).isEqualTo("preferred-name");
+        assertThat(row.preferredNameNorm).isEqualTo("preferredname");
         assertThat(row.titleOrig).isEqualTo("title");
         assertThat(row.titleNorm).isEqualTo("title");
         assertThat(row.organizations).isNotNull();
diff --git a/repo/system-init/src/main/resources/initial-objects/report/110-report-user-list.xml b/repo/system-init/src/main/resources/initial-objects/report/110-report-user-list.xml
index 535c8bc9145..fc8058fb3aa 100644
--- a/repo/system-init/src/main/resources/initial-objects/report/110-report-user-list.xml
+++ b/repo/system-init/src/main/resources/initial-objects/report/110-report-user-list.xml
@@ -97,11 +97,16 @@
                 <previousColumn>nameColumn</previousColumn>
             </column>
             <column id="8">
-                <name>activationColumn</name>
-                <path>activation/administrativeStatus</path>
+                <name>displayNameColumn</name>
+                <path>displayName</path>
                 <previousColumn>fullNameColumn</previousColumn>
             </column>
             <column id="9">
+                <name>activationColumn</name>
+                <path>activation/administrativeStatus</path>
+                <previousColumn>displayNameColumn</previousColumn>
+            </column>
+            <column id="10">
                 <name>roleColumn</name>
                 <path>assignment</path>
                 <display>
@@ -133,7 +138,7 @@
                 </export>
                 <previousColumn>activationColumn</previousColumn>
             </column>
-            <column id="10">
+            <column id="11">
                 <name>orgColumn</name>
                 <path>assignment</path>
                 <display>
@@ -165,7 +170,7 @@
                 </export>
                 <previousColumn>roleColumn</previousColumn>
             </column>
-            <column id="11">
+            <column id="12">
                 <name>accountColumn</name>
                 <path>linkRef</path>
                 <display>
diff --git a/repo/system-init/src/main/resources/initial-objects/user/050-user-administrator.xml b/repo/system-init/src/main/resources/initial-objects/user/050-user-administrator.xml
index 1c794769599..ed5bcc761f6 100644
--- a/repo/system-init/src/main/resources/initial-objects/user/050-user-administrator.xml
+++ b/repo/system-init/src/main/resources/initial-objects/user/050-user-administrator.xml
@@ -12,6 +12,7 @@
     <name>administrator</name>
     <indestructible>true</indestructible>
     <fullName>midPoint Administrator</fullName>
+    <displayName>midPoint Administrator</displayName>
     <givenName>midPoint</givenName>
     <familyName>Administrator</familyName>
     <assignment id="1">
diff --git a/testing/story/src/test/resources/common/user-administrator.xml b/testing/story/src/test/resources/common/user-administrator.xml
index dcc1ca2d5a5..a3f59244a46 100644
--- a/testing/story/src/test/resources/common/user-administrator.xml
+++ b/testing/story/src/test/resources/common/user-administrator.xml
@@ -12,6 +12,7 @@
     xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'>
     <name>administrator</name>
     <fullName>midPoint Administrator</fullName>
+    <displayName>midPoint Administrator</displayName>
     <givenName>midPoint</givenName>
     <familyName>Administrator</familyName>
     <emailAddress>administrator@evolveum.com</emailAddress>
diff --git a/testing/story/src/test/resources/strings/users/bob.xml b/testing/story/src/test/resources/strings/users/bob.xml
index 24aa5506d31..dd0f1bba7e5 100644
--- a/testing/story/src/test/resources/strings/users/bob.xml
+++ b/testing/story/src/test/resources/strings/users/bob.xml
@@ -17,6 +17,7 @@
         <targetRef oid="00000000-0000-0000-0000-000000000008" type="RoleType"/>        <!-- End User -->
     </assignment>
     <fullName>Ghost Pirate Bob</fullName>
+    <displayName>Ghost Pirate Bob</displayName>
     <givenName>Bob</givenName>
     <emailAddress>bob@evolveum.com</emailAddress>
     <credentials>
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java
index 8b7eb36b0b7..739061e3149 100644
--- a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java
+++ b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java
@@ -84,8 +84,8 @@ public class ExportMiningConsumerWorker extends AbstractWriterConsumerWorker<Exp
 
     private static final String ARCHETYPE_REF_ATTRIBUTE_NAME = "archetypeRef";
     private static final List<String> DEFAULT_EXCLUDED_ATTRIBUTES = List.of("description", "documentation", "emailAddress",
-            "telephoneNumber", "name", "fullName", "givenName", "familyName", "additionalName", "nickName", "personalNumber",
-            "identifier", "jpegPhoto");
+            "telephoneNumber", "name", "fullName", "preferredName", "displayName", "givenName", "familyName",
+            "additionalName", "nickName", "personalNumber", "identifier", "jpegPhoto");
 
     public ExportMiningConsumerWorker(NinjaContext context, ExportMiningOptions options, BlockingQueue<FocusType> queue,
             OperationStatus operation) {
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/stats/ExportFocusStatisticsAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/stats/ExportFocusStatisticsAction.java
index 52a1f58258c..c7019310b74 100644
--- a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/stats/ExportFocusStatisticsAction.java
+++ b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/stats/ExportFocusStatisticsAction.java
@@ -22,10 +22,11 @@ public class ExportFocusStatisticsAction extends AbstractRepositorySearchAction<
             new ItemName(SchemaConstants.NS_C, "locality"), new ItemName(SchemaConstants.NS_C, "preferredLanguage"),
             new ItemName(SchemaConstants.NS_C, "locale"), new ItemName(SchemaConstants.NS_C, "timezone"),
             new ItemName(SchemaConstants.NS_C, "emailAddress"), new ItemName(SchemaConstants.NS_C, "telephoneNumber"),
-            new ItemName(SchemaConstants.NS_C, "fullName"), new ItemName(SchemaConstants.NS_C, "givenName"),
-            new ItemName(SchemaConstants.NS_C, "familyName"), new ItemName(SchemaConstants.NS_C, "additionalName"),
-            new ItemName(SchemaConstants.NS_C, "nickName"), new ItemName(SchemaConstants.NS_C, "honorificPrefix"),
-            new ItemName(SchemaConstants.NS_C, "honorificSuffix"), new ItemName(SchemaConstants.NS_C, "title"),
+            new ItemName(SchemaConstants.NS_C, "fullName"), new ItemName(SchemaConstants.NS_C, "preferredName"),
+            new ItemName(SchemaConstants.NS_C, "givenName"), new ItemName(SchemaConstants.NS_C, "familyName"),
+            new ItemName(SchemaConstants.NS_C, "additionalName"), new ItemName(SchemaConstants.NS_C, "nickName"),
+            new ItemName(SchemaConstants.NS_C, "honorificPrefix"), new ItemName(SchemaConstants.NS_C, "honorificSuffix"),
+            new ItemName(SchemaConstants.NS_C, "title"),
             new ItemName(SchemaConstants.NS_C, "employeeNumber"), new ItemName(SchemaConstants.NS_C, "personalNumber"),
             new ItemName(SchemaConstants.NS_C, "organization"),
             new ItemName(SchemaConstants.NS_C, "organizationalUnit"), new ItemName(SchemaConstants.NS_C, "displayName"),