diff --git a/samples/demo/opendj.xml b/samples/demo/opendj.xml
index 4bb415266b2..84c151a7be0 100644
--- a/samples/demo/opendj.xml
+++ b/samples/demo/opendj.xml
@@ -439,9 +439,9 @@
 			
 			<association>
 				<ref>ri:ldapGroups</ref>
-				<tolerant>true</tolerant>
-				<matchingRule>mr:stringIgnoreCase</matchingRule>
 				<displayName>Group Membership</displayName>
+				<matchingRule>mr:stringIgnoreCase</matchingRule>
+				<tolerant>true</tolerant>
 				<kind>entitlement</kind>
 				<intent>group</intent>
 				<direction>objectToSubject</direction>
diff --git a/samples/demo/org.xml b/samples/demo/org.xml
index 2d40653ae6b..dcff79cc336 100644
--- a/samples/demo/org.xml
+++ b/samples/demo/org.xml
@@ -70,6 +70,8 @@
 		<name>F0200</name>
 		<description>Everything that moves or otherwise.</description>
 		<parentOrgRef oid="c74a7d86-7798-11e2-964e-100000000000" type="c:OrgType"/>
+		<displayName>Department of Machines</displayName>
+		<identifier>0200</identifier>
 		<inducement>
 			<description>Access to engineering library</description>
 			<construction>
@@ -116,8 +118,6 @@
 				</association>
 		    </construction>
 		</inducement>
-		<displayName>Department of Machines</displayName>
-		<identifier>0200</identifier>
 		<orgType>functional</orgType>
 		<costCenter>CC200</costCenter>
 	</org>