diff --git a/components/editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/components/editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
index a27b8c75fa..5e40494258 100644
--- a/components/editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
+++ b/components/editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Configuration;
+using System.Drawing;
 using System.Web;
 using System.Web.Security;
 using System.Web.UI;
@@ -18,25 +19,25 @@ using umbraco.cms.businesslogic.datatype;
 
 namespace umbraco.editorControls.userControlGrapper
 {
-    public class usercontrolPrevalueEditor : System.Web.UI.WebControls.PlaceHolder, umbraco.interfaces.IDataPrevalue
-    {
-        public ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
+	public class usercontrolPrevalueEditor : System.Web.UI.WebControls.PlaceHolder, umbraco.interfaces.IDataPrevalue
+	{
+		public ISqlHelper SqlHelper
+		{
+			get { return Application.SqlHelper; }
+		}
 
-        #region IDataPrevalue Members
+		#region IDataPrevalue Members
 
-        // referenced datatype
-        private umbraco.cms.businesslogic.datatype.BaseDataType _datatype;
+		// referenced datatype
+		private umbraco.cms.businesslogic.datatype.BaseDataType _datatype;
 
-        private DropDownList _dropdownlist;
-        private DropDownList _dropdownlistUserControl;
-        private PlaceHolder _phSettings;
+		private DropDownList _dropdownlist;
+		private DropDownList _dropdownlistUserControl;
+		private PlaceHolder _phSettings;
 
-        private Dictionary<string, DataEditorSettingType> dtSettings = new Dictionary<string, DataEditorSettingType>();
+		private Dictionary<string, DataEditorSettingType> dtSettings = new Dictionary<string, DataEditorSettingType>();
 
-        public usercontrolPrevalueEditor(umbraco.cms.businesslogic.datatype.BaseDataType DataType) 
+		public usercontrolPrevalueEditor(umbraco.cms.businesslogic.datatype.BaseDataType DataType) 
 		{
 			// state it knows its datatypedefinitionid
 			_datatype = DataType;
@@ -56,229 +57,283 @@ namespace umbraco.editorControls.userControlGrapper
 			_dropdownlistUserControl = new DropDownList();
 			_dropdownlistUserControl.ID = "usercontrol";
 
-            _phSettings = new PlaceHolder();
-            _phSettings.ID = "settings";
+			_phSettings = new PlaceHolder();
+			_phSettings.ID = "settings";
 
 			// put the childcontrols in context - ensuring that
 			// the viewstate is persisted etc.
 			Controls.Add(_dropdownlist);
 			Controls.Add(_dropdownlistUserControl);
-            Controls.Add(_phSettings);
+			Controls.Add(_phSettings);
 
-            // populate the usercontrol dropdown
-            _dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), ""));
-            populateUserControls( IOHelper.MapPath( SystemDirectories.Usercontrols) );
+			// populate the usercontrol dropdown
+			_dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), ""));
+			populateUserControls( IOHelper.MapPath( SystemDirectories.Usercontrols) );
 
-           
+		   
 		}
 
-        private void populateUserControls(string path)
-        {
-            DirectoryInfo di = new DirectoryInfo(path);
-            foreach (FileInfo uc in di.GetFiles("*.ascx"))
-            {
-                string root = IOHelper.MapPath(SystemDirectories.Root);
+		private void populateUserControls(string path)
+		{
+			DirectoryInfo di = new DirectoryInfo(path);
+			foreach (FileInfo uc in di.GetFiles("*.ascx"))
+			{
+				string root = IOHelper.MapPath(SystemDirectories.Root);
 
-                _dropdownlistUserControl.Items.Add(
-                    
-                    new ListItem( 
-                            uc.FullName.Substring(root.Length).Replace(IOHelper.DirSepChar, '/'))
+				_dropdownlistUserControl.Items.Add(
+					
+					new ListItem( 
+							uc.FullName.Substring(root.Length).Replace(IOHelper.DirSepChar, '/'))
 
-                    /*
-                    new ListItem( 
-                        uc.FullName.Substring( uc.FullName.IndexOf(root), uc.FullName.Length - uc.FullName.IndexOf(root)).Replace(IOHelper.DirSepChar, '/'))
-                      */  
-                        );
+					/*
+					new ListItem( 
+						uc.FullName.Substring( uc.FullName.IndexOf(root), uc.FullName.Length - uc.FullName.IndexOf(root)).Replace(IOHelper.DirSepChar, '/'))
+					  */  
+						);
 
-            }
-            foreach (DirectoryInfo dir in di.GetDirectories())
-                populateUserControls(dir.FullName);
-        }
+			}
+			foreach (DirectoryInfo dir in di.GetDirectories())
+				populateUserControls(dir.FullName);
+		}
 
-        public Control Editor
-        {
-            get
-            {
-                return this;
-            }
-        }
+		public Control Editor
+		{
+			get
+			{
+				return this;
+			}
+		}
 
 
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            if (!Page.IsPostBack)
-            {
-                string config = Configuration;
-                if (config != "")
-                {
-                    _dropdownlistUserControl.SelectedValue = config;
+		protected override void OnLoad(EventArgs e)
+		{
+			base.OnLoad(e);
+			if (!Page.IsPostBack)
+			{
+				string config = Configuration;
+				if (config != "")
+				{
+					_dropdownlistUserControl.SelectedValue = config;
 
-                    
-                }
-                _dropdownlist.SelectedValue = _datatype.DBType.ToString();
+					
+				}
+				_dropdownlist.SelectedValue = _datatype.DBType.ToString();
 
 
-                
-            }
+				
+			}
 
-            //check for settings
-            if (!string.IsNullOrEmpty(Configuration))
-                LoadSetttings(Configuration);
-           
+			//check for settings
+			if (!string.IsNullOrEmpty(Configuration))
+				LoadSetttings(Configuration);
+		   
 
-        }
+		}
 
-        private Dictionary<string, DataEditorSetting> GetSettings(Type t)
-        {
-            Dictionary<string, DataEditorSetting> settings = new Dictionary<string, DataEditorSetting>();
+		private Dictionary<string, DataEditorSetting> GetSettings(Type t)
+		{
+			Dictionary<string, DataEditorSetting> settings = new Dictionary<string, DataEditorSetting>();
 
-            foreach (System.Reflection.PropertyInfo p in t.GetProperties())
-            {
+			foreach (System.Reflection.PropertyInfo p in t.GetProperties())
+			{
 
-                object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
+				object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
 
-                if (o.Length > 0)
-                    settings.Add(p.Name, (DataEditorSetting)o[0]);
-            }
-            return settings;
-        }
+				if (o.Length > 0)
+					settings.Add(p.Name, (DataEditorSetting)o[0]);
+			}
+			return settings;
+		}
 
-        private bool HasSettings(Type t)
-        {
-            bool hasSettings = false;
-            foreach (System.Reflection.PropertyInfo p in t.GetProperties())
-            {
-                object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
+		private bool HasSettings(Type t)
+		{
+			bool hasSettings = false;
+			foreach (System.Reflection.PropertyInfo p in t.GetProperties())
+			{
+				object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
 
-                if (o.Length > 0)
-                {
-                    hasSettings = true;
-                    break;
-                }
-            }
+				if (o.Length > 0)
+				{
+					hasSettings = true;
+					break;
+				}
+			}
 
-            return hasSettings;
-        }
+			return hasSettings;
+		}
 
-        private void LoadSetttings(string fileName)
-        {
-            if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName)))
-            {
-              
-                UserControl oControl = (UserControl)this.Page.LoadControl(@"~/" + fileName);
+		private void LoadSetttings(string fileName)
+		{
+			if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName)))
+			{
+			  
+				UserControl oControl = (UserControl)this.Page.LoadControl(@"~/" + fileName);
 
-                Type type = oControl.GetType();
+				Type type = oControl.GetType();
 
 
-                Dictionary<string, DataEditorSetting> settings = GetSettings(type);
+				Dictionary<string, DataEditorSetting> settings = GetSettings(type);
 
-                foreach (KeyValuePair<string, DataEditorSetting> kv in settings)
-                {
-                    DataEditorSettingType dst = kv.Value.GetDataEditorSettingType();
-                    dtSettings.Add(kv.Key, dst);
+				foreach (KeyValuePair<string, DataEditorSetting> kv in settings)
+				{
+					DataEditorSettingType dst = kv.Value.GetDataEditorSettingType();
+					dtSettings.Add(kv.Key, dst);
 
-                    DataEditorPropertyPanel panel = new DataEditorPropertyPanel();
-                    panel.Text = kv.Value.GetName();
-                    panel.Text += "<br/><small>" + kv.Value.description + "</small>";
+					DataEditorPropertyPanel panel = new DataEditorPropertyPanel();
+					panel.Text = kv.Value.GetName();
+					panel.Text += "<br/><small>" + kv.Value.description + "</small>";
 
 
-                    if (HasSettings(type))
-                    {
-                        DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
+					if (HasSettings(type))
+					{
+						DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
 
-                        List<Setting<string, string>> s = ss.GetSettings(_datatype.DataTypeDefinitionId);
-                        ss.Dispose();
+						List<Setting<string, string>> s = ss.GetSettings(_datatype.DataTypeDefinitionId);
+						ss.Dispose();
 
-                        if (s.Find(set => set.Key == kv.Key).Value != null)
-                            dst.Value = s.Find(set => set.Key == kv.Key).Value;
+						if (s.Find(set => set.Key == kv.Key).Value != null)
+							dst.Value = s.Find(set => set.Key == kv.Key).Value;
 
-                    }
+					}
 
-                    panel.Controls.Add(dst.RenderControl(kv.Value));
+					panel.Controls.Add(dst.RenderControl(kv.Value));
 
-                    _phSettings.Controls.Add(panel);
+					Label invalid = new Label();
+					invalid.Attributes.Add("style", "color:#8A1F11");
+					invalid.ID = "lbl" + kv.Key;
+					panel.Controls.Add(invalid);
 
-                }
-            }
-        }
+					_phSettings.Controls.Add(panel);
+					
+				}
+			}
+		}
 
-        public void Save()
-        {
-            _datatype.DBType = (umbraco.cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(umbraco.cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
+		public void Save()
+		{
+			bool hasErrors = false;
+			foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
+			{
+				var result = k.Value.Validate();
+				 Label lbl = FindControlRecursive<Label>(_phSettings, "lbl" + k.Key);
+				if(result == null && lbl != null)
+				{
+					if(lbl != null)
+						lbl.Text = string.Empty;
+				}
+				else
+				{
+					if(hasErrors == false)
+						hasErrors = true;
 
-            // Generate data-string
-            string data = _dropdownlistUserControl.SelectedValue;
+					if (lbl != null)
+						lbl.Text = " " + result.ErrorMessage;
+				}
+			}
 
-            // If the add new prevalue textbox is filled out - add the value to the collection.
-            IParameter[] SqlParams = new IParameter[] {
-			            SqlHelper.CreateParameter("@value",data),
-						SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
-            // we need to populate the parameters again due to an issue with SQL CE
-            SqlParams = new IParameter[] {
-			            SqlHelper.CreateParameter("@value",data),
-						SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+			if (!hasErrors)
+			{
+				_datatype.DBType =
+					(umbraco.cms.businesslogic.datatype.DBTypes)
+					Enum.Parse(typeof (umbraco.cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
+
+				// Generate data-string
+				string data = _dropdownlistUserControl.SelectedValue;
+
+				// If the add new prevalue textbox is filled out - add the value to the collection.
+				IParameter[] SqlParams = new IParameter[]
+											 {
+												 SqlHelper.CreateParameter("@value", data),
+												 SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
+											 };
+				SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+				// we need to populate the parameters again due to an issue with SQL CE
+				SqlParams = new IParameter[]
+								{
+									SqlHelper.CreateParameter("@value", data),
+									SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
+								};
+				SqlHelper.ExecuteNonQuery(
+					"insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+					SqlParams);
 
 
-            //settings
+				//settings
 
-            DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
+				DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
 
-            //ss.ClearSettings(_datatype.DataTypeDefinitionId);
+				//ss.ClearSettings(_datatype.DataTypeDefinitionId);
 
-            int i = 0;
-            foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
-            {
-                ss.InsertSetting(_datatype.DataTypeDefinitionId, k.Key, k.Value.Value, i);
-                i++;
+				int i = 0;
+				foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
+				{
+					ss.InsertSetting(_datatype.DataTypeDefinitionId, k.Key, k.Value.Value, i);
+					i++;
 
-            }
+				}
 
-            ss.Dispose();
+				ss.Dispose();
 
-            if (dtSettings.Count == 0)
-            {
-                if (!string.IsNullOrEmpty(Configuration))
-                    LoadSetttings(Configuration);
-            }
+				if (dtSettings.Count == 0)
+				{
+					if (!string.IsNullOrEmpty(Configuration))
+						LoadSetttings(Configuration);
+				}
 
-           
-        }
+			}
+		}
 
-        protected override void Render(HtmlTextWriter writer)
-        {
-            writer.WriteLine("<div class=\"propertyItem\">");
-            writer.WriteLine("<div class=\"propertyItemheader\">Database datatype</div>");
-            writer.WriteLine("<div class=\"propertyItemContent\">");
-            _dropdownlist.RenderControl(writer);
-            writer.Write("</div></div>");
+		protected override void Render(HtmlTextWriter writer)
+		{
+			writer.WriteLine("<div class=\"propertyItem\">");
+			writer.WriteLine("<div class=\"propertyItemheader\">Database datatype</div>");
+			writer.WriteLine("<div class=\"propertyItemContent\">");
+			_dropdownlist.RenderControl(writer);
+			writer.Write("</div></div>");
 
-            writer.WriteLine("<div class=\"propertyItem\">");
-            writer.WriteLine("<div class=\"propertyItemheader\">Usercontrol:</div>");
-            writer.WriteLine("<div class=\"propertyItemContent\">");
-            _dropdownlistUserControl.RenderControl(writer);
-            writer.Write("</div></div>");
+			writer.WriteLine("<div class=\"propertyItem\">");
+			writer.WriteLine("<div class=\"propertyItemheader\">Usercontrol:</div>");
+			writer.WriteLine("<div class=\"propertyItemContent\">");
+			_dropdownlistUserControl.RenderControl(writer);
+			writer.Write("</div></div>");
 
-            _phSettings.RenderControl(writer);
-        }
+			_phSettings.RenderControl(writer);
+		}
 
-        public string Configuration
-        {
-            get
-            {
-                object conf =
-                    SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-                                            SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
-                if (conf != null)
-                    return conf.ToString();
-                else
-                    return "";
+		public string Configuration
+		{
+			get
+			{
+				object conf =
+					SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
+											SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+				if (conf != null)
+					return conf.ToString();
+				else
+					return "";
 
-            }
-        }
+			}
+		}
 
-        #endregion
-    }
+		private static T FindControlRecursive<T>(Control parent, string id) where T : Control
+		{
+			if ((parent is T) && (parent.ID == id))
+			{
+				return (T)parent;
+			}
+
+			foreach (Control control in parent.Controls)
+			{
+				T foundControl = FindControlRecursive<T>(control, id);
+				if (foundControl != null)
+				{
+					return foundControl;
+				}
+			}
+			return default(T);
+		}
+
+
+		#endregion
+	}
 }
diff --git a/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs b/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
index 6ae055cd69..13cf7ab942 100644
--- a/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
+++ b/umbraco/cms/businesslogic/datatype/DataEditorSetting.cs
@@ -14,6 +14,8 @@ namespace umbraco.cms.businesslogic.datatype
         public Type type;
         public string prevalues;
         public object defaultValue;
+        public bool isRequired;
+        public string regexValidationStatement;
 
         public DataEditorSetting(string name)
         {
@@ -21,6 +23,8 @@ namespace umbraco.cms.businesslogic.datatype
             description = "";
             type = System.Web.Compilation.BuildManager.GetType("umbraco.editorControls.SettingControls.TextField, umbraco.editorControls",false);
             prevalues = "";
+            isRequired = false;
+            regexValidationStatement = "";
         }
 
         public string GetName()
@@ -50,6 +54,10 @@ namespace umbraco.cms.businesslogic.datatype
             if (dst != null)
                 dst.Prevalues = GetPrevalues();
 
+            dst.IsRequired = isRequired;
+            dst.RegexValidationStatement = regexValidationStatement;
+
+
             return dst;
         }
     }
diff --git a/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs b/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
index 96abb43070..fd164168d8 100644
--- a/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
+++ b/umbraco/cms/businesslogic/datatype/DataEditorSettingType.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace umbraco.cms.businesslogic.datatype
 {
@@ -18,5 +19,18 @@ namespace umbraco.cms.businesslogic.datatype
         }
 
         public string DefaultValue { get; set; }
+
+        public bool IsRequired { get; set; }
+        public string RegexValidationStatement { get; set; }
+
+        public virtual DataEditorSettingValidationResult Validate()
+        {
+            if (IsRequired && string.IsNullOrEmpty(Value))
+                return new DataEditorSettingValidationResult("Value is required");
+            else if (!string.IsNullOrEmpty(RegexValidationStatement) && !Regex.IsMatch(Value, RegexValidationStatement))
+                return new DataEditorSettingValidationResult("Value does not match the required pattern");
+            else
+                return null;
+        }
     }
 }
diff --git a/umbraco/cms/businesslogic/datatype/DataEditorSettingValidationResult.cs b/umbraco/cms/businesslogic/datatype/DataEditorSettingValidationResult.cs
new file mode 100644
index 0000000000..a5d55d01c9
--- /dev/null
+++ b/umbraco/cms/businesslogic/datatype/DataEditorSettingValidationResult.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace umbraco.cms.businesslogic.datatype
+{
+    public class DataEditorSettingValidationResult
+    {
+        public String ErrorMessage { get; set; }
+
+        public DataEditorSettingValidationResult(string errorMessage)
+        {
+            ErrorMessage = errorMessage;
+
+        }
+    }
+}
diff --git a/umbraco/cms/businesslogic/datatype/DefaultPreValueEditor.cs b/umbraco/cms/businesslogic/datatype/DefaultPreValueEditor.cs
index b7268017d2..ac3f9409fb 100644
--- a/umbraco/cms/businesslogic/datatype/DefaultPreValueEditor.cs
+++ b/umbraco/cms/businesslogic/datatype/DefaultPreValueEditor.cs
@@ -171,32 +171,57 @@ namespace umbraco.cms.businesslogic.datatype
 
         public void Save()
         {
-            // save the prevalue data and get on with you life ;)
-            if (_datatype != null)
-                _datatype.DBType = (cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
-            else if (_datatypeOld != null)
-                _datatypeOld.DBType = (DBTypes)Enum.Parse(typeof(DBTypes), _dropdownlist.SelectedValue, true);
-
-
-            if (_displayTextBox)
-            {
-                // If the prevalue editor has an prevalue textbox - save the textbox value as the prevalue
-                Prevalue = _textbox.Text;
-            }
-
-            DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
-
-            ss.ClearSettings(_datatype.DataTypeDefinitionId);
-
-            int i = 0;
+            bool hasErrors = false;
             foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
             {
-                ss.InsertSetting(_datatype.DataTypeDefinitionId, k.Key, k.Value.Value, i);
-                i++;
+                var result = k.Value.Validate();
+                Label lbl = FindControlRecursive<Label>(this, "lbl" + k.Key);
+                if (result == null && lbl != null)
+                {
+                    if (lbl != null)
+                        lbl.Text = string.Empty;
+                }
+                else
+                {
+                    if (hasErrors == false)
+                        hasErrors = true;
 
+                    if (lbl != null)
+                        lbl.Text = " " + result.ErrorMessage;
+                }
             }
 
-            ss.Dispose();      
+            if (!hasErrors)
+            {
+                // save the prevalue data and get on with you life ;)
+                if (_datatype != null)
+                    _datatype.DBType =
+                        (cms.businesslogic.datatype.DBTypes)
+                        Enum.Parse(typeof (cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
+                else if (_datatypeOld != null)
+                    _datatypeOld.DBType = (DBTypes) Enum.Parse(typeof (DBTypes), _dropdownlist.SelectedValue, true);
+
+
+                if (_displayTextBox)
+                {
+                    // If the prevalue editor has an prevalue textbox - save the textbox value as the prevalue
+                    Prevalue = _textbox.Text;
+                }
+
+                DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
+
+                ss.ClearSettings(_datatype.DataTypeDefinitionId);
+
+                int i = 0;
+                foreach (KeyValuePair<string, DataEditorSettingType> k in dtSettings)
+                {
+                    ss.InsertSetting(_datatype.DataTypeDefinitionId, k.Key, k.Value.Value, i);
+                    i++;
+
+                }
+
+                ss.Dispose();
+            }
         }
 
         //protected override void Render(HtmlTextWriter writer)
@@ -293,10 +318,33 @@ namespace umbraco.cms.businesslogic.datatype
 
                 panel.Controls.Add(dst.RenderControl(kv.Value));
 
+                Label invalid = new Label();
+                invalid.Attributes.Add("style", "color:#8A1F11");
+                invalid.ID = "lbl" + kv.Key;
+                panel.Controls.Add(invalid);
+
                 this.Controls.Add(panel);
             }
             
         }
+
+        private static T FindControlRecursive<T>(Control parent, string id) where T : Control
+        {
+            if ((parent is T) && (parent.ID == id))
+            {
+                return (T)parent;
+            }
+
+            foreach (Control control in parent.Controls)
+            {
+                T foundControl = FindControlRecursive<T>(control, id);
+                if (foundControl != null)
+                {
+                    return foundControl;
+                }
+            }
+            return default(T);
+        }
     }
 
 
diff --git a/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs b/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
index 81ac894ac4..ef046f38ad 100644
--- a/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
+++ b/umbraco/cms/businesslogic/datatype/IDataEditorSettingType.cs
@@ -10,5 +10,10 @@ namespace umbraco.cms.businesslogic.datatype
         string Value { get; set; }
         string DefaultValue { get; set; }
         System.Web.UI.Control RenderControl(DataEditorSetting setting);
+
+        bool IsRequired { get; set; }
+        string RegexValidationStatement { get; set; }
+
+        DataEditorSettingValidationResult Validate();
     }
 }
diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj
index 0af33c35ad..8582d789cd 100644
--- a/umbraco/cms/umbraco.cms.csproj
+++ b/umbraco/cms/umbraco.cms.csproj
@@ -204,6 +204,7 @@
     <Compile Include="businesslogic\datatype\DataEditorSetting.cs" />
     <Compile Include="businesslogic\datatype\DataEditorSettingsStorage.cs" />
     <Compile Include="businesslogic\datatype\DataEditorSettingType.cs" />
+    <Compile Include="businesslogic\datatype\DataEditorSettingValidationResult.cs" />
     <Compile Include="businesslogic\datatype\DBTypes.cs" />
     <Compile Include="businesslogic\datatype\IDataEditorSettingType.cs" />
     <Compile Include="businesslogic\datatype\PreValue.cs" />