diff --git a/source/java/org/alfresco/repo/forms/PropertyFieldDefinition.java b/source/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
index 1ce859fbbd..d8a4682d87 100644
--- a/source/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
+++ b/source/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.repo.dictionary.IndexTokenisationMode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -42,6 +43,7 @@ public class PropertyFieldDefinition extends FieldDefinition
     protected DataTypeParameters dataTypeParams;
     protected boolean mandatory = false;
     protected boolean repeats = false;
+    protected IndexTokenisationMode indexTokenisationMode = IndexTokenisationMode.TRUE;
     protected List<FieldConstraint> constraints;
     
     /**
@@ -149,6 +151,26 @@ public class PropertyFieldDefinition extends FieldDefinition
         this.constraints = constraints;
     }
 
+    /**
+     * Returns a IndexTokenisationMode the property
+     * 
+     * @return IndexTokenisationMode objects or null
+     */
+    public IndexTokenisationMode getIndexTokenisationMode()
+    {
+        return indexTokenisationMode;
+    }
+
+    /**
+     * Sets the IndexTokenisationMode objects for the property
+     * 
+     * @param indexTokenisationMode objects
+     */
+    public void setIndexTokenisationMode(IndexTokenisationMode indexTokenisationMode)
+    {
+        this.indexTokenisationMode = indexTokenisationMode;
+    }
+
     /*
      * @see java.lang.Object#toString()
      */
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 cdec616fd2..08ec7bc6f3 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
@@ -183,6 +183,8 @@ public class PropertyFieldProcessor extends QNameFieldProcessor<PropertyDefiniti
         fieldDef.setMandatory(propDef.isMandatory());
         fieldDef.setRepeating(propDef.isMultiValued());
 
+        fieldDef.setIndexTokenisationMode(propDef.getIndexTokenisationMode());
+
         // any property from the system model (sys prefix) should be protected
         // the model doesn't
         // currently enforce this so make sure they are not editable