diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
index 2bc1eb16c2..d2558d0451 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
@@ -273,10 +273,10 @@ namespace Umbraco.Web.Models.Mapping
             var result = new Dictionary<string, bool>();
             foreach (var role in Roles.GetAllRoles().Distinct())
             {
-                result.Add(role, false);
                 // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access
                 if (role.StartsWith(Constants.Conventions.Member.InternalRolePrefix) == false)
                 {
+                    result.Add(role, false);
                     if (username.IsNullOrWhiteSpace()) continue;
                     if (Roles.IsUserInRole(username, role))
                     {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
index 02e695ee30..6121d2f69b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
@@ -67,29 +67,26 @@ function openMemberGroup(id) {
             Array.Sort(roles);
 
             foreach(string role in roles) {
-//            MemberGroup[] MemberGroups = MemberGroup.GetAll;
-            
-//            for (int i = 0; i < MemberGroups.Length; i++)
-//            {
-                XmlTreeNode xNode = XmlTreeNode.Create(this);
-                xNode.NodeID = role;
-                xNode.Text = role;
-                xNode.Action = "javascript:openMemberGroup('" + HttpContext.Current.Server.UrlEncode(role.Replace("'", "\\'")) + "');";
-                xNode.Icon = "icon-users";
-                if (!Member.IsUsingUmbracoRoles())
+                if (role.StartsWith(Constants.Conventions.Member.InternalRolePrefix) == false)
                 {
-                    xNode.Menu = null;
-                }
+                    XmlTreeNode xNode = XmlTreeNode.Create(this);
+                    xNode.NodeID = role;
+                    xNode.Text = role;
+                    xNode.Action = "javascript:openMemberGroup('" + HttpContext.Current.Server.UrlEncode(role.Replace("'", "\\'")) + "');";
+                    xNode.Icon = "icon-users";
+                    if (!Member.IsUsingUmbracoRoles())
+                    {
+                        xNode.Menu = null;
+                    }
 
-                OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
-                if (xNode != null)
-                {
-                    tree.Add(xNode);
+                    OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
+                    if (xNode != null)
+                    {
+                        tree.Add(xNode);
+                    }
+                    OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
                 }
-                OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
             }
         }
-
 	}
-    
 }