diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
index be129bf859..028653912b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
@@ -12,7 +12,7 @@
                 </div>
         </div>
 
-        <div class="umb-panel-body no-header umb-scrollable" auto-scale="1" ng-switch="wizardStep">
+        <div class="umb-panel-body no-header umb-scrollable" auto-scale="90" ng-switch="wizardStep">
             
             <umb-control-group label="Choose a macro" ng-switch-when="macroSelect">
                 <select class="umb-editor" ng-change="submitForm()" name="selectedMacro" ng-model="$parent.$parent.selectedMacro" ng-options="m as m.name for m in macros" required>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.controller.js
deleted file mode 100644
index 82f1dd003d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.controller.js
+++ /dev/null
@@ -1,26 +0,0 @@
-function contentTypePicker($scope, entityResource) {
-
-    entityResource.getAll("DocumentType").then(function (data) {
-        //convert the ids to strings so the drop downs work properly when comparing
-        _.each(data, function(d) {
-            d.id = d.id.toString();
-        });
-        $scope.contentTypes = data;
-    });
-
-    if ($scope.model.value === null || $scope.model.value === undefined) {
-        if ($scope.model.config.multiple) {
-            $scope.model.value = [];
-        }
-        else {
-            $scope.model.value = "";
-        }
-    }
-    else {
-        //if it's multiple, change the value to an array
-        if ($scope.model.config.multiple) {
-            $scope.model.value = $scope.model.value.split(',');
-        }
-    }
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentTypeController", contentTypePicker);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js
new file mode 100644
index 0000000000..be338389ad
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js
@@ -0,0 +1,40 @@
+/** A drop down list or multi value select list based on an entity type, this can be re-used for any entity types */
+function entityPicker($scope, entityResource) {
+
+    //set the default to DocumentType
+    if (!$scope.model.config.entityType) {
+        $scope.model.config.entityType = "DocumentType";
+    }
+
+    //Determine the select list options and which value to publish
+    if (!$scope.model.config.publishBy) {
+        $scope.selectOptions = "entity.id as entity.name for entity in entities";
+    }
+    else {
+        $scope.selectOptions = "entity." + $scope.model.config.publishBy + " as entity.name for entity in entities";
+    }
+
+    entityResource.getAll($scope.model.config.entityType).then(function (data) {
+        //convert the ids to strings so the drop downs work properly when comparing
+        _.each(data, function(d) {
+            d.id = d.id.toString();
+        });
+        $scope.entities = data;
+    });
+
+    if ($scope.model.value === null || $scope.model.value === undefined) {
+        if ($scope.model.config.multiple) {
+            $scope.model.value = [];
+        }
+        else {
+            $scope.model.value = "";
+        }
+    }
+    else {
+        //if it's multiple, change the value to an array
+        if ($scope.model.config.multiple === "1") {
+            $scope.model.value = $scope.model.value.split(',');
+        }
+    }
+}
+angular.module('umbraco').controller("Umbraco.PropertyEditors.EntityPickerController", entityPicker);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html
similarity index 62%
rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.html
rename to src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html
index cab7477cf9..274710b14e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contenttypepicker/contenttypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html
@@ -1,10 +1,10 @@
-<div ng-controller="Umbraco.PropertyEditors.ContentTypeController" ng-switch="model.config.multiple">
+<div ng-controller="Umbraco.PropertyEditors.EntityPickerController" ng-switch="model.config.multiple">
     
     <select name="contentTypeList"
         class="umb-editor umb-dropdown"
         ng-switch-default
         ng-model="model.value"
-        ng-options="contentType.id as contentType.name for contentType in contentTypes">
+        ng-options="{{selectOptions}}">
     </select>
     
     <!--NOTE: This ng-switch is required because ng-multiple doesn't actually support dynamic bindings with multi-select lists -->
@@ -13,7 +13,7 @@
         ng-switch-when="1"
         multiple
         ng-model="model.value"
-        ng-options="contentType.id as contentType.name for contentType in contentTypes">
+        ng-options="{{selectOptions}}">
     </select>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
deleted file mode 100644
index 163f58dec6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
+++ /dev/null
@@ -1,11 +0,0 @@
-angular.module('umbraco').controller("Umbraco.PropertyEditors.UserPickerController",
-	function($rootScope, $scope, $log, userResource){
-
-    userResource.getAll().then(function (userArray) {
-        $scope.users = userArray;
-    });
-    	    
-    if ($scope.model.value === null || $scope.model.value === undefined) {
-        $scope.model.value = "";
-    }
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
deleted file mode 100644
index badfdbfd69..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<select
-	ng-controller="Umbraco.PropertyEditors.UserPickerController" 
-	name="{{ model.alias }}" 
-	ng-model=" model.value" 
-	ng-options="user.id as user.name for user in users">
-    <option value="">Select User</option>
-</select>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 44be3c39b4..15e6978f92 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -10,6 +10,7 @@ using Examine.LuceneEngine;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
@@ -341,41 +342,38 @@ namespace Umbraco.Web.Editors
             {
                 //TODO: Should we order this by something ?
                 var entities = Services.EntityService.GetAll(objectType.Value).WhereNotNull().Select(Mapper.Map<EntityBasic>);
-                
-                //if a post filter is assigned then try to execute it
-                if (postFilter.IsNullOrWhiteSpace() == false)
-                {
-                    return postFilterParams == null
-                               ? entities.AsQueryable().Where(postFilter).ToArray()
-                               : entities.AsQueryable().Where(postFilter, postFilterParams).ToArray();
-
-                }
-                return entities;
+                return ExecutePostFilter(entities, postFilter, postFilterParams);                
             }
             //now we need to convert the unknown ones
             switch (entityType)
             {
                 case UmbracoEntityTypes.Macro:                    
                     //Get all macros from the macro service
-                    var result = Services.MacroService.GetAll().WhereNotNull().OrderBy(x => x.Name).AsQueryable();
+                    var macros = Services.MacroService.GetAll().WhereNotNull().OrderBy(x => x.Name);
+                    var filteredMacros = ExecutePostFilter(macros, postFilter, postFilterParams);
+                    return filteredMacros.Select(Mapper.Map<EntityBasic>);
 
-                    //if a post filter is assigned then try to execute it
-                    if (postFilter.IsNullOrWhiteSpace() == false)
-                    {
-                        result = postFilterParams == null
-                            ? result.Where(postFilter)
-                            : result.Where(postFilter, postFilterParams);
+                case UmbracoEntityTypes.PropertyType:
 
-                    }
+                    //get all document types, then combine all property types into one list
+                    var propertyTypes = Services.ContentTypeService.GetAllContentTypes().Cast<IContentTypeComposition>()
+                                                .Concat(Services.ContentTypeService.GetAllMediaTypes())
+                                                .ToArray()
+                                                .SelectMany(x => x.PropertyTypes)
+                                                .DistinctBy(composition => composition.Alias);
+                    var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter, postFilterParams);
+                    return Mapper.Map<IEnumerable<PropertyType>, IEnumerable<EntityBasic>>(filteredPropertyTypes);
 
-                    return result.Select(Mapper.Map<EntityBasic>);
+                case UmbracoEntityTypes.User:
+
+                    var users = Services.UserService.GetAllUsers();
+                    var filteredUsers = ExecutePostFilter(users, postFilter, postFilterParams);
+                    return Mapper.Map<IEnumerable<IUser>, IEnumerable<EntityBasic>>(filteredUsers);
 
                 case UmbracoEntityTypes.Domain:
 
                 case UmbracoEntityTypes.Language:
 
-                case UmbracoEntityTypes.User:
-
                 default:
                     throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType);
             }
@@ -392,6 +390,8 @@ namespace Umbraco.Web.Editors
             //now we need to convert the unknown ones
             switch (entityType)
             {
+                case UmbracoEntityTypes.PropertyType:
+
                 case UmbracoEntityTypes.Domain:
 
                 case UmbracoEntityTypes.Language:
@@ -420,6 +420,8 @@ namespace Umbraco.Web.Editors
             //now we need to convert the unknown ones
             switch (entityType)
             {
+                case UmbracoEntityTypes.PropertyType:
+
                 case UmbracoEntityTypes.Domain:
                     
                 case UmbracoEntityTypes.Language:
@@ -465,5 +467,26 @@ namespace Umbraco.Web.Editors
             }
         }
 
+        /// <summary>
+        /// Executes the post filter against a collection of objects
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="entities"></param>
+        /// <param name="postFilter"></param>
+        /// <param name="postFilterParams"></param>
+        /// <returns></returns>
+        private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string postFilter, IDictionary<string, object> postFilterParams)
+        {
+            //if a post filter is assigned then try to execute it
+            if (postFilter.IsNullOrWhiteSpace() == false)
+            {
+                return postFilterParams == null
+                               ? entities.AsQueryable().Where(postFilter).ToArray()
+                               : entities.AsQueryable().Where(postFilter, postFilterParams).ToArray();
+
+            }
+            return entities;
+        } 
+
     }
 }
diff --git a/src/Umbraco.Web/Models/ContentEditing/UmbracoEntityTypes.cs b/src/Umbraco.Web/Models/ContentEditing/UmbracoEntityTypes.cs
index f6d98cfbbb..8743e3cbd2 100644
--- a/src/Umbraco.Web/Models/ContentEditing/UmbracoEntityTypes.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/UmbracoEntityTypes.cs
@@ -78,6 +78,11 @@
         /// <summary>
         /// Data Type
         /// </summary>
-        DataType
+        DataType,
+
+        /// <summary>
+        /// Property Type
+        /// </summary>
+        PropertyType
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
index 6b61384e85..ca8ffe6b92 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
@@ -6,6 +6,7 @@ using Examine;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
@@ -17,6 +18,17 @@ namespace Umbraco.Web.Models.Mapping
             config.CreateMap<UmbracoEntity, EntityBasic>()
                   .ForMember(basic => basic.Icon, expression => expression.MapFrom(entity => entity.ContentTypeIcon));
 
+            config.CreateMap<PropertyType, EntityBasic>()
+                  .ForMember(basic => basic.Icon, expression => expression.UseValue("icon-box"))
+                  .ForMember(basic => basic.Path, expression => expression.UseValue(""))
+                  .ForMember(basic => basic.ParentId, expression => expression.UseValue(-1));
+
+            config.CreateMap<IUser, EntityBasic>()
+                  .ForMember(basic => basic.Icon, expression => expression.UseValue("icon-user"))
+                  .ForMember(basic => basic.Path, expression => expression.UseValue(""))
+                  .ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
+                  .ForMember(basic => basic.Alias, expression => expression.MapFrom(user => user.Username));
+
             config.CreateMap<SearchResult, EntityBasic>()
                 //default to document icon
                   .ForMember(x => x.Icon, expression => expression.UseValue("icon-document"))
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
index 51984bb239..03855e83f5 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
@@ -8,18 +8,13 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [ParameterEditor("contentType", "Content Type Picker", "contenttypepicker")]
+    [ParameterEditor("contentType", "Content Type Picker", "entitypicker")]
     public class ContentTypeParameterEditor : ParameterEditor
     {
-        
-    }
-
-    [ParameterEditor("contentTypeMultiple", "Multiple Content Type Picker", "contenttypepicker")]
-    public class MultipleContentTypeParameterEditor : ParameterEditor
-    {
-        public MultipleContentTypeParameterEditor()
+        public ContentTypeParameterEditor()
         {
-            Configuration.Add("multiple", "1");
+            Configuration.Add("multiple", "0");
+            Configuration.Add("entityType", "DocumentType");
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
new file mode 100644
index 0000000000..f09896f8a2
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
@@ -0,0 +1,14 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    [ParameterEditor("contentTypeMultiple", "Multiple Content Type Picker", "entitypicker")]
+    public class MultipleContentTypeParameterEditor : ParameterEditor
+    {
+        public MultipleContentTypeParameterEditor()
+        {
+            Configuration.Add("multiple", "1");
+            Configuration.Add("entityType", "DocumentType");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
new file mode 100644
index 0000000000..93817e0758
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    [ParameterEditor("propertyTypePickerMultiple", "Multiple Property Type Picker", "entitypicker")]
+    public class MultiplePropertyTypeParameterEditor : ParameterEditor
+    {
+        public MultiplePropertyTypeParameterEditor()
+        {
+            Configuration.Add("multiple", "1");
+            Configuration.Add("entityType", "PropertyType");
+            //don't publish the id for a property type, publish it's alias
+            Configuration.Add("publishBy", "alias");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
new file mode 100644
index 0000000000..8ddabde128
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors.ParameterEditors
+{
+    [ParameterEditor("propertyTypePicker", "Property Type Picker", "entitypicker")]
+    public class PropertyTypeParameterEditor : ParameterEditor
+    {
+        public PropertyTypeParameterEditor()
+        {
+            Configuration.Add("multiple", "0");
+            Configuration.Add("entityType", "PropertyType");
+            //don't publish the id for a property type, publish it's alias
+            Configuration.Add("publishBy", "alias");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
index 4fb52da9c1..e43708836a 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
@@ -1,13 +1,28 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [PropertyEditor(Constants.PropertyEditors.UserPickerAlias, "User picker", "INT", "userpicker")]
+    [PropertyEditor(Constants.PropertyEditors.UserPickerAlias, "User picker", "INT", "entitypicker")]
     public class UserPickerPropertyEditor : PropertyEditor
     {
+        private IDictionary<string, object> _defaultPreValues;
 
+        public UserPickerPropertyEditor()
+        {
+            _defaultPreValues = new Dictionary<string, object>
+                {
+                    {"entityType", "User"}
+                };
+        }
+
+        public override IDictionary<string, object> DefaultPreValues
+        {
+            get { return _defaultPreValues; }
+            set { _defaultPreValues = value; }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index edf3d98c8b..13f28eb131 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -347,6 +347,9 @@
     <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
     <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />