diff --git a/components/editorControls/SettingControls/TextField.cs b/components/editorControls/SettingControls/TextField.cs
index 37d124c1c9..7f614fc4db 100644
--- a/components/editorControls/SettingControls/TextField.cs
+++ b/components/editorControls/SettingControls/TextField.cs
@@ -30,8 +30,8 @@ namespace umbraco.editorControls.SettingControls
             tb.CssClass = "guiInputText guiInputStandardSize";
 
 
-            if (string.IsNullOrEmpty(tb.Text) && Prevalues.Count > 0)
-                tb.Text = Prevalues[0];
+            if (string.IsNullOrEmpty(tb.Text) && !string.IsNullOrEmpty(DefaultValue))
+                tb.Text = DefaultValue;
 
             return tb;
         }
diff --git a/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs b/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
index 033fe8f08e..52a761e237 100644
--- a/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
+++ b/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
@@ -13,13 +13,13 @@ namespace umbraco.cms.businesslogic.datatype
         public string description;
         public string type;
         public string prevalues;
+        public object defaultValue;
 
         public DataEditorSetting(string name)
         {
             this.name = name;
             description = "";
             type = "umbraco.editorControls.SettingControls.TextField, umbraco.editorControls";
-
             prevalues = "";
         }
 
@@ -44,7 +44,8 @@ namespace umbraco.cms.businesslogic.datatype
             Type t = System.Web.Compilation.BuildManager.GetType(type, false);
             DataEditorSettingType dst = (DataEditorSettingType)System.Activator.CreateInstance(t, true);
 
-          
+            if(defaultValue != null)
+                dst.DefaultValue = defaultValue.ToString();
 
             if (dst != null)
                 dst.Prevalues = GetPrevalues();
diff --git a/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs b/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
index 750054285a..96abb43070 100644
--- a/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
+++ b/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
@@ -16,5 +16,7 @@ namespace umbraco.cms.businesslogic.datatype
             get { return m_prevalues; }
             set { m_prevalues = value; }
         }
+
+        public string DefaultValue { get; set; }
     }
 }
diff --git a/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs b/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
index 2351863b88..81ac894ac4 100644
--- a/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
+++ b/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
@@ -8,6 +8,7 @@ namespace umbraco.cms.businesslogic.datatype
     public interface IDataEditorSettingType
     {
         string Value { get; set; }
+        string DefaultValue { get; set; }
         System.Web.UI.Control RenderControl(DataEditorSetting setting);
     }
 }