diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
index f31b16a6da..f93b4c7a9a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
@@ -1,11 +1,11 @@
 <div>
 
     <input type="email" name="textbox"
-        ng-model="model.value"
-        id="{{model.alias}}"
-        class="umb-editor umb-textstring textstring"
-        ng-required="model.config.IsRequired"
-        val-server="value" />
+           ng-model="model.value"
+           id="{{model.alias}}"
+           class="umb-editor umb-textstring textstring"
+           ng-required="model.config.IsRequired || model.validation.mandatory"
+           val-server="value" />
     
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="email">Invalid email</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 30286fa982..b2c57b4737 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -2,7 +2,7 @@
     <input type="text" name="textbox" ng-model="model.value" id="{{model.alias}}"
            class="umb-editor umb-textstring textstring"
            val-server="value"
-           ng-required="model.config.IsRequired || model.validation.mandatory"
+           ng-required="model.validation.mandatory"
            ng-trim="false" />
 
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
index a1b544228a..2bc1eb16c2 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
@@ -187,7 +187,7 @@ namespace Umbraco.Web.Models.Mapping
                         Label = ui.Text("general", "email"),
                         Value = display.Email,
                         View = "email",
-                        Config = new Dictionary<string, object> { { "IsRequired", true } }
+                        Validation = { Mandatory = true }        
                     },
                 new ContentPropertyDisplay
                     {
@@ -259,7 +259,7 @@ namespace Umbraco.Web.Models.Mapping
             if (member.HasIdentity == false || scenario == MembershipScenario.NativeUmbraco)
             {
                 prop.View = "textbox";
-                prop.Config = new Dictionary<string, object> {{"IsRequired", true}};
+                prop.Validation.Mandatory = true;
             }
             else
             {
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
index bfdf8fc8df..b4b702f935 100644
--- a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
@@ -21,6 +21,8 @@ namespace Umbraco.Web.PropertyEditors
 
         internal class EmailAddressePreValueEditor : PreValueEditor
         {
+            //TODO: This doesn't seem necessary since it can be specified at the property type level - this will however be useful if/when
+            // we support overridden property value pre-value options.
             [PreValueField("Required?", "boolean")]
             public bool IsRequired { get; set; }
         }