diff --git a/component/core/src/main/java/io/meeds/social/core/identity/service/UserImportService.java b/component/core/src/main/java/io/meeds/social/core/identity/service/UserImportService.java
index d201ab36859..04760196e51 100644
--- a/component/core/src/main/java/io/meeds/social/core/identity/service/UserImportService.java
+++ b/component/core/src/main/java/io/meeds/social/core/identity/service/UserImportService.java
@@ -553,6 +553,9 @@ protected List<String> computeFields(UserImportResult userImportResult, List<Str
       if (!STANDARD_FIELDS.contains(field)) {
         if (!field.contains(".")) {
           ProfilePropertySetting propertySetting = profilePropertyService.getProfileSettingByName(field);
+          if (propertySetting != null && !propertySetting.getPropertyName().equals(field)) {
+            propertySetting = null;
+          }
           if (propertySetting == null) {
             userImportResult.addWarnMessage("ALL", "PROFILE_PROPERTY_DOES_NOT_EXIST:" + field);
             unauthorizedFields.add(field);
@@ -566,6 +569,9 @@ protected List<String> computeFields(UserImportResult userImportResult, List<Str
         } else {
           String[] fieldNames = field.split("\\.");
           ProfilePropertySetting parentProperty = profilePropertyService.getProfileSettingByName(fieldNames[0]);
+          if (parentProperty != null && !parentProperty.getPropertyName().equals(fieldNames[0])) {
+            parentProperty = null;
+          }
           if (fieldNames.length > 2) {
             userImportResult.addWarnMessage("ALL", "PROPERTY_HAS_MORE_THAN_ONE_PARENT:" + field);
             unauthorizedFields.add(field);