diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
index 67104c10fc..5fb1e1211b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
@@ -12,6 +12,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using umbraco.BasePages;
 using umbraco.cms.businesslogic;
+using umbraco.cms.businesslogic.datatype;
 using umbraco.cms.businesslogic.propertytype;
 using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
@@ -309,6 +310,11 @@ namespace umbraco.controls
 
             foreach (var property in DataTypes)
             {
+                var defaultData = property.Value.Data as DefaultData;
+                if (defaultData != null)
+                {
+                    defaultData.PropertyTypeAlias = property.Key;
+                }
                 property.Value.DataEditor.Save();
             }
 
diff --git a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
index 82212664d7..03851a9341 100644
--- a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
@@ -69,7 +69,7 @@ namespace umbraco.cms.businesslogic.datatype
                .On<PropertyTypeDto, PropertyDataDto>(x => x.Id, y => y.PropertyTypeId)
                .InnerJoin<DataTypeDto>()
                .On<DataTypeDto, PropertyTypeDto>(x => x.DataTypeId, y => y.DataTypeId)
-               .Where("cmsPropertyData.id = @Id", new {Id = _propertyId});
+               .Where<PropertyDataDto>(x => x.Id == _propertyId);
             var dto = Database.Fetch<PropertyDataDto, PropertyTypeDto, DataTypeDto>(sql).FirstOrDefault();
 
             if (dto != null)
@@ -88,6 +88,8 @@ namespace umbraco.cms.businesslogic.datatype
             }
         }
 
+        internal string PropertyTypeAlias { get; set; }
+
         public DBTypes DatabaseType
         {
             get
diff --git a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
index f459d22e79..9607b41f6f 100644
--- a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
+++ b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
@@ -6,7 +6,6 @@ using System.Xml;
 using Umbraco.Core.IO;
 using Umbraco.Core.Media;
 using umbraco.cms.businesslogic.Files;
-using umbraco.cms.businesslogic.property;
 
 namespace umbraco.cms.businesslogic.datatype
 {
@@ -89,11 +88,9 @@ namespace umbraco.cms.businesslogic.datatype
                         // check for auto fill of other properties (width, height, extension and filesize)
                         if (UmbracoSettings.ImageAutoFillImageProperties != null)
                         {
-                            string propertyTypeAlias = new Property(PropertyId).PropertyType.Alias;
-
                             XmlNode uploadFieldConfigNode =
                                 UmbracoSettings.ImageAutoFillImageProperties.SelectSingleNode(
-                                    string.Format("uploadField [@alias = \"{0}\"]", propertyTypeAlias));
+                                    string.Format("uploadField [@alias = \"{0}\"]", PropertyTypeAlias));
 
                             if (uploadFieldConfigNode != null)
                             {
@@ -126,12 +123,11 @@ namespace umbraco.cms.businesslogic.datatype
             if(PropertyId == default(int))
                 return;
 
-            string propertyTypeAlias = new Property(PropertyId).PropertyType.Alias;
             if (UmbracoSettings.ImageAutoFillImageProperties != null)
             {
                 XmlNode uploadFieldConfigNode =
                     UmbracoSettings.ImageAutoFillImageProperties.SelectSingleNode(
-                        string.Format("uploadField [@alias = \"{0}\"]", propertyTypeAlias));
+                        string.Format("uploadField [@alias = \"{0}\"]", PropertyTypeAlias));
                 if (uploadFieldConfigNode != null)
                 {
                     // get the current document