diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 9bec1b8025..131a198fcf 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -66,16 +66,20 @@
       <property name="eagerOrphanCleanup" >
          <value>${system.content.eagerOrphanCleanup}</value>
       </property>
-      <property name="stores" >
-         <list>
-            <ref bean="fileContentStore" />
-         </list>
-      </property>
+      <property name="stores" ref="contentStoresToClean" />
       <property name="listeners" >
          <ref bean="deletedContentBackupListeners" />
       </property>
    </bean>
    
+   <bean id="contentStoresToClean" class="java.util.ArrayList" >
+      <constructor-arg>
+         <list>
+            <ref bean="fileContentStore" />
+         </list>
+      </constructor-arg>
+   </bean>
+   
    <!-- Abstract bean definition defining base definition for content service -->
    <bean id="baseContentService" class="org.alfresco.repo.content.ContentServiceImpl" abstract="true" init-method="init">
       <property name="retryingTransactionHelper">
diff --git a/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
index 96825793ff..6ee2f4bf9c 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
+import org.alfresco.repo.dictionary.constraint.RegisteredConstraint;
 import org.alfresco.repo.forms.Field;
 import org.alfresco.repo.forms.FieldGroup;
 import org.alfresco.repo.forms.PropertyFieldDefinition;
@@ -217,8 +218,16 @@ public class PropertyFieldProcessor extends QNameFieldProcessor<PropertyDefiniti
                 String type = constraint.getType();
                 Map<String, Object> params = constraint.getParameters();
                 
-                // ListOfValuesConstraints have special handling for localising their allowedValues.
-                if (ListOfValuesConstraint.CONSTRAINT_TYPE.equals(constraint.getType()))
+                
+                //ListOfValuesConstraints have special handling for localising their allowedValues.
+                //If the constraint that we are currently handling is a registered constraint then
+                //we need to examine the underlying constraint to see if it is a LIST constraint
+                if (RegisteredConstraint.class.isAssignableFrom(constraint.getClass()))
+                {
+                    constraint = ((RegisteredConstraint)constraint).getRegisteredConstraint();
+                }
+                
+                if (ListOfValuesConstraint.class.isAssignableFrom(constraint.getClass()))
                 {
                     ListOfValuesConstraint lovConstraint = (ListOfValuesConstraint) constraint;
                     List<String> allowedValues = lovConstraint.getAllowedValues();