diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml
index ad0d034..faead4e 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/archetypes/500-archetype-hr-person.xml
@@ -13,7 +13,7 @@
     		<tooltip>Person imported from the HR CSV</tooltip>
     		<icon>
     			<cssClass>fa fa-user-circle</cssClass>
-    			<color>olive</color>
+    			<color>purple</color>
     		</icon>
     	</display>
     </archetypePolicy>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
index 9f8e308..c259816 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
@@ -86,13 +86,19 @@
 				<matchingRule>mr:distinguishedName</matchingRule>
                 <outbound>
                     <strength>strong</strength>
+					<source>
+                        <path>familyName</path>
+                    </source>
                     <source>
-                        <path>name</path>
+                        <path>givenName</path>
                     </source>
                     <expression>
                         <script>
                             <code>
-                                'uid=' + name + ',ou=People,dc=internet2,dc=edu'
+								tmpGivenName = basic.norm(basic.stringify(givenName))?.tr(' ', '.')
+                                tmpFamilyName = basic.norm(basic.stringify(familyName))?.tr(' ', '.')
+							    tmpuid = tmpGivenName.substring(0, 1) + tmpFamilyName + iterationToken
+                                'uid=' + tmpuid + ',ou=People,dc=internet2,dc=edu'
                             </code>
                         </script>
                     </expression>
@@ -147,9 +153,21 @@
 				<matchingRule>mr:stringIgnoreCase</matchingRule>
                 <outbound>
                     <strength>strong</strength>
+					<source>
+                        <path>familyName</path>
+                    </source>
                     <source>
-                        <path>name</path>
+                        <path>givenName</path>
                     </source>
+					<expression>
+                        <script>
+                            <code>
+							  tmpGivenName = basic.norm(basic.stringify(givenName))?.tr(' ', '.')
+                              tmpFamilyName = basic.norm(basic.stringify(familyName))?.tr(' ', '.')
+							  return tmpGivenName.substring(0, 1) + tmpFamilyName + iterationToken
+                            </code>
+                        </script>
+                    </expression>
                 </outbound>
 			</attribute>
 			<attribute>
@@ -220,6 +238,20 @@
                     <outbound/>
                 </password>
             </credentials>
+            <iteration>
+                <maxIterations>10</maxIterations>
+                <tokenExpression>
+                    <script>
+                        <code>
+                            if (iteration == 0) {
+                                return "";
+                            } else {
+                                return sprintf("%02d", iteration);
+                            }
+                        </code>
+                    </script>
+                </tokenExpression>
+            </iteration>
 		</objectType>
         
         <objectType>