diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 43ccd32ef6..1994917f2f 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -2,13 +2,12 @@
 
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
-@using umbraco.cms.businesslogic.member
 @using Umbraco.Web
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 
 @{
-    var profileModel = new ProfileModel();
+    var profileModel = Members.CreateProfileModel();
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
@@ -17,10 +16,11 @@
     Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
 }
 
-@if (Member.IsLoggedOn())
-{
-    @Html.RenderJsHere()
+@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
+@Html.RenderJsHere()
 
+@if (Members.IsLoggedIn())
+{
     using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
@@ -38,11 +38,11 @@
             @Html.ValidationMessageFor(m => profileModel.Email)
             <br />
 
-            @for (var i = 0; i < profileModel.MemberProperties.Count; i++)
+            @foreach (var prop in profileModel.MemberProperties)
             {
-                @Html.LabelFor(m => profileModel.MemberProperties[i].Value, profileModel.MemberProperties[i].Name)
-                @Html.EditorFor(m => profileModel.MemberProperties[i].Value)
-                @Html.HiddenFor(m => profileModel.MemberProperties[i].Alias)
+                @Html.LabelFor(m => prop.Value, prop.Name)
+                @Html.EditorFor(m => prop.Value)
+                @Html.HiddenFor(m => prop.Alias)
                 <br />
             }
        
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
index ed7697721e..1994917f2f 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
@@ -1,14 +1,13 @@
-@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
-@using umbraco.cms.businesslogic.member
 @using Umbraco.Web
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 
 @{
-    var profileModel = new ProfileModel();
+    var profileModel = Members.CreateProfileModel();
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
@@ -17,10 +16,11 @@
     Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
 }
 
-@if (Member.IsLoggedOn())
-{
-    @Html.RenderJsHere()
+@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
+@Html.RenderJsHere()
 
+@if (Members.IsLoggedIn())
+{
     using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
@@ -38,11 +38,11 @@
             @Html.ValidationMessageFor(m => profileModel.Email)
             <br />
 
-            @for (var i = 0; i < profileModel.MemberProperties.Count; i++)
+            @foreach (var prop in profileModel.MemberProperties)
             {
-                @Html.LabelFor(m => profileModel.MemberProperties[i].Value, profileModel.MemberProperties[i].Name)
-                @Html.EditorFor(m => profileModel.MemberProperties[i].Value)
-                @Html.HiddenFor(m => profileModel.MemberProperties[i].Alias)
+                @Html.LabelFor(m => prop.Value, prop.Name)
+                @Html.EditorFor(m => prop.Value)
+                @Html.HiddenFor(m => prop.Alias)
                 <br />
             }
        
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index a467040eba..6cced72c73 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -87,7 +87,7 @@
              - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
                         error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
              Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>inline</MacroErrors>
+    <MacroErrors>throw</MacroErrors>
 
     <!-- How Umbraco should show icons in the document type editor. Historically, the list has included all the files in
              /Umbraco/Images/Umbraco plus a CSS sprite defined in Umbraco_Client/Tree/treeIcons.css, unfortunately these 
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index d654c1e737..c1b8c3d14e 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -17,21 +17,11 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();    
             }
 
-            //Validate credentials
-            if (Membership.ValidateUser(model.Username, model.Password) == false)
+            if (Members.Login(model.Username, model.Password) == false)
             {
                 ModelState.AddModelError("loginModel.Username", "Invalid username or password");
                 return CurrentUmbracoPage();
             }
-            //Set member online
-            var member = Membership.GetUser(model.Username, true);
-            if (member == null)
-            {
-                ModelState.AddModelError("Username", "Member not found");
-                return CurrentUmbracoPage();
-            }
-            //Log them in
-            FormsAuthentication.SetAuthCookie(member.UserName, true);
 
             return Redirect("/");            
         }
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 0c32eb4ddc..19a7ef2b00 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
-            if (HttpContext.User != null && HttpContext.User.Identity.IsAuthenticated)
+            if (Members.IsLoggedIn())
             {
                 FormsAuthentication.SignOut();
             }
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index ef1891832d..564a56c0d4 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
-            if (HttpContext.User == null || HttpContext.User.Identity.IsAuthenticated == false)
+            if (Members.IsLoggedIn() == false)
             {
                 throw new NotSupportedException("No member is currently logged in");
             }
diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs
index 00dde77c50..9d8bfd9291 100644
--- a/src/Umbraco.Web/Models/ProfileModel.cs
+++ b/src/Umbraco.Web/Models/ProfileModel.cs
@@ -1,47 +1,37 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Web;
 using umbraco.cms.businesslogic.member;
+using Umbraco.Core;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Models
 {
     public class ProfileModel
     {
-        public ProfileModel()
+        public static ProfileModel CreateModel()
         {
-            if (Member.IsLoggedOn())
+            var model = new ProfileModel(false);
+            return model;
+        }
+
+        private ProfileModel(bool doLookup)
+        {
+            MemberProperties = new List<UmbracoProperty>();
+            if (doLookup)
             {
-                //TODO Use new Member API
-                var member = Member.GetCurrentMember();
+                var helper = new MembershipHelper(ApplicationContext.Current, new HttpContextWrapper(HttpContext.Current));
+                var model = helper.CreateProfileModel();
+                MemberProperties = model.MemberProperties;
+            }   
+        }
 
-                if (member != null)
-                {
-                    this.Name = member.Text;
-
-                    this.Email = member.Email;
-
-                    this.MemberProperties = new List<UmbracoProperty>();
-
-                    var memberType = MemberType.GetByAlias(member.ContentType.Alias);
-
-                    foreach (var prop in memberType.PropertyTypes.Where(memberType.MemberCanEdit))
-                    {
-                        var value = string.Empty;
-                        var propValue = member.getProperty(prop.Alias);
-                        if (propValue != null)
-                        {
-                            value = propValue.Value.ToString();
-                        }
-
-                        this.MemberProperties.Add(new UmbracoProperty
-                                                  {
-                                                      Alias = prop.Alias,
-                                                      Name = prop.Name,
-                                                      Value = value
-                                                  });
-                    }
-                }
-            }
+        [Obsolete("Do not use this ctor as it will perform business logic lookups. Use the MembershipHelper.CreateProfileModel or the static ProfileModel.CreateModel() to create an empty model.")]
+        public ProfileModel()
+            :this(true)
+        {
         }
 
         [Required]
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 66218a363e..0e46e2b13e 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -27,6 +27,7 @@ namespace Umbraco.Web.Models
             RedirectOnSucces = false;
             RedirectUrl = "/";
             UsernameIsEmail = true;
+            MemberProperties = new List<UmbracoProperty>();
 
             if (doLookup && HttpContext.Current != null && ApplicationContext.Current != null)
             {
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index a2b31bae50..f7fb3ef912 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Web;
 using System.Web.Security;
 using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Security;
 using Umbraco.Web.Models;
@@ -37,6 +38,88 @@ namespace Umbraco.Web.Security
         }
         #endregion
 
+        /// <summary>
+        /// Returns true if the current membership provider is the Umbraco built-in one.
+        /// </summary>
+        /// <returns></returns>
+        public bool IsUmbracoMembershipProviderActive()
+        {
+            return Membership.Provider.IsUmbracoMembershipProvider();
+        }
+
+        /// <summary>
+        /// A helper method to perform the validation and logging in of a member - this is simply wrapping standard membership provider and asp.net forms auth logic.
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        public bool Login(string username, string password)
+        {
+            //Validate credentials
+            if (Membership.ValidateUser(username, password) == false)
+            {
+                return false;
+            }
+            //Set member online
+            var member = Membership.GetUser(username, true);
+            if (member == null)
+            {
+                //this should not happen
+                LogHelper.Warn<MembershipHelper>("The member validated but then no member was returned with the username " + username);                
+                return false;
+            }
+            //Log them in
+            FormsAuthentication.SetAuthCookie(member.UserName, true);
+            return true;
+        }
+
+        /// <summary>
+        /// Creates a new profile model filled in with the current members details if they are logged in.
+        /// </summary>
+        /// <returns></returns>
+        public ProfileModel CreateProfileModel()
+        {
+            if (IsLoggedIn() == false)
+            {
+                return null;
+            }
+
+            if (Membership.Provider.IsUmbracoMembershipProvider())
+            {
+                var member = GetCurrentMember();
+                //this shouldn't happen
+                if (member == null) return null;
+
+                var model = ProfileModel.CreateModel();
+                model.Name = member.Name;
+                model.Email = member.Email;
+
+                var memberType = member.ContentType;
+
+                foreach (var prop in memberType.PropertyTypes.Where(x => memberType.MemberCanEditProperty(x.Alias)))
+                {
+                    var value = string.Empty;
+                    var propValue = member.Properties[prop.Alias];
+                    if (propValue != null)
+                    {
+                        value = propValue.Value.ToString();
+                    }
+
+                    model.MemberProperties.Add(new UmbracoProperty
+                    {
+                        Alias = prop.Alias,
+                        Name = prop.Name,
+                        Value = value
+                    });
+                }
+                return model;
+            }
+
+            //we can try to look up an associated member by the provider user key
+            //TODO: Support this at some point!
+            throw new NotSupportedException("Currently a member profile cannot be edited unless using the built-in Umbraco membership providers");
+        }
+
         /// <summary>
         /// Creates a model to use for registering new members with custom member properties
         /// </summary>
@@ -84,8 +167,7 @@ namespace Umbraco.Web.Security
             var model = LoginStatusModel.CreateModel();
             if (Membership.Provider.IsUmbracoMembershipProvider())
             {
-                var member = _applicationContext.Services.MemberService.GetByUsername(
-                    _httpContext.User.Identity.Name);
+                var member = GetCurrentMember();
                 //this shouldn't happen
                 if (member == null) return null;
                 model.Name = member.Name;
@@ -106,6 +188,15 @@ namespace Umbraco.Web.Security
             return model;
         }
 
+        /// <summary>
+        /// Check if a member is logged in
+        /// </summary>
+        /// <returns></returns>
+        public bool IsLoggedIn()
+        {
+            return _httpContext.User != null && _httpContext.User.Identity.IsAuthenticated;
+        }
+
         /// <summary>
         /// Returns true or false if the currently logged in member is authorized based on the parameters provided
         /// </summary>
@@ -253,13 +344,5 @@ namespace Umbraco.Web.Security
             return member;
         }
 
-        /// <summary>
-        /// Check if a member is logged in
-        /// </summary>
-        /// <returns></returns>
-        private bool IsLoggedIn()
-        {
-            return _httpContext.User != null && _httpContext.User.Identity.IsAuthenticated;
-        }
     }
 }