diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 2f1211f420..eb5f7b443a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -11,6 +11,9 @@
                placeholder="@placeholders_entername"
                ng-model="content.name"/>
             </div>
+            <div class="umb-headline-editor-wrapper span7" ng-if="content.membershipScenario != 0">
+                <h1>{{content.name}}</h1>
+            </div>
 
             <div class="span5">
                 <div class="btn-toolbar pull-right umb-btn-toolbar">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index aba6ff960e..fadbbd4cab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -7,7 +7,7 @@
     <div class="row-fluid" ng-switch-when="false">
         <div class="umb-sub-header">
 
-            <div class="btn-group" ng-show="listViewAllowedTypes">
+            <div class="btn-group" ng-show="listViewAllowedTypes && listViewAllowedTypes.length > 0">
                 <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
                     <localize key="actions_create">Create</localize>
                     <span class="caret"></span>
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index 8b098d82d9..c47f1d0662 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Web.Security;
 using AutoMapper;
 using Umbraco.Core.Models;
+using Umbraco.Core.Security;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi.Filters;
@@ -25,6 +27,7 @@ namespace Umbraco.Web.Editors
         public MemberTypeController()
             : this(UmbracoContext.Current)
         {
+            _provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
         }
 
         /// <summary>
@@ -34,15 +37,23 @@ namespace Umbraco.Web.Editors
         public MemberTypeController(UmbracoContext umbracoContext)
             : base(umbracoContext)
         {
+            _provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
         }
 
+        private readonly MembershipProvider _provider;
+
         /// <summary>
         /// Returns all member types
         /// </summary>
         public IEnumerable<ContentTypeBasic> GetAllTypes()
         {
-            return Services.MemberTypeService.GetAll()
-                           .Select(Mapper.Map<IMemberType, ContentTypeBasic>);
+            if (_provider.IsUmbracoMembershipProvider())
+            {
+                return Services.MemberTypeService.GetAll()
+                               .Select(Mapper.Map<IMemberType, ContentTypeBasic>);    
+            }
+            return Enumerable.Empty<ContentTypeBasic>();
+
         }
     }
 }
\ No newline at end of file