diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index 84b5a132f0..645979f4b0 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -746,6 +746,44 @@
     </bean>
     
     
+    <!-- Person Service -->
+    
+    <bean id="PersonService" class="org.springframework.aop.framework.ProxyFactoryBean">
+    	<property name="proxyInterfaces">
+    		<value>org.alfresco.service.cmr.security.PersonService</value>
+    	</property>
+    	<property name="target"><ref bean="personService"/></property>
+    	<property name="interceptorNames">
+    		<list>
+    		    <idref local="PersonService_transaction" />
+                <idref local="exceptionTranslator" />
+                <idref bean="PersonService_security" />
+    			<idref local="PersonService_descriptor" />
+    		</list>
+    	</property>
+    </bean>
+
+    <bean id="PersonService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
+    
+    <bean id="PersonService_descriptor" parent="AlfrescoServiceDescriptor">
+    	<property name="interface">
+    		<value>org.alfresco.service.cmr.security.PersonService</value>
+    	</property>
+    	<property name="description">
+    		<value>PersonService Service</value>
+    	</property>
+    </bean>
+    
+    
     
      <!-- Authentication Service -->
     
diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
index 524e4ee029..a5559e29b6 100644
--- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -299,7 +300,7 @@ public class PersonServiceImpl implements PersonService
         sp.addStore(storeRef);
         sp.excludeDataInTheCurrentTransaction(false);
 
-        HashSet<NodeRef> nodes = new HashSet<NodeRef>();
+        LinkedHashSet<NodeRef> nodes = new LinkedHashSet<NodeRef>();
         ResultSet rs = null;
 
         try