Index: frontend/src/main/resources/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesForm.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- frontend/src/main/resources/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesForm.js	(revision 52760)
+++ frontend/src/main/resources/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesForm.js	(revision )
@@ -280,9 +280,13 @@
         _addField: function(record) {
             var defaultValue = record.get('defaultValue'),
                 value = record.get('value'),
+                displayValue = record.get('displayValue'),
                 xtype = record.get('type'),
                 field;
 
+            if(!Ext.isEmpty(displayValue)) {
+                value = displayValue;
+            }
             if (Ext.isEmpty(value)) {
                 value = defaultValue;
             }
@@ -562,7 +566,7 @@
                     autoLoad: false,
                     method: 'GET',
                     root: 'properties',
-                    fields: ['name', 'value', 'initialValue', 'label', 'required', 'description', 'docType', 'type', 'docLocation', 'allowCreation', 'defaultValue',
+                    fields: ['name', 'value', 'displayValue','initialValue', 'label', 'required', 'description', 'docType', 'type', 'docLocation', 'allowCreation', 'defaultValue',
                         'pickerConfiguration', 'pickerInitialPath', 'pickerRemembersLastVisited', 'pickerPathIsRelative', 'pickerRootPath', 'pickerSelectableNodeTypes',
                         'dropDownListValues', 'dropDownListDisplayValues', 'hiddenInChannelManager', 'groupLabel'],
                     url: this.composerRestMountUrl + '/' + this.componentId + './' + encodeURIComponent(this.variant.id) + '/' + this.locale + '?FORCE_CLIENT_HOST=true'