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 888fda5c55..71e75315d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -6,35 +6,42 @@
       ng-submit="save()"
       val-form-manager>
 
-      <umb-editor-view ng-if="!page.loading" umb-tabs>
+      <umb-editor-view ng-if="!page.loading">
 
          <umb-editor-header
             name="content.name"
-            tabs="content.tabs"
             menu="page.menu"
             hide-icon="true"
             hide-description="true"
             hide-alias="true">
          </umb-editor-header>
 
-         <umb-editor-container>
+         <umb-editor-container class="form-horizontal">
 
-            <umb-tabs-content view="true" class="form-horizontal">
-                <umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
+            <div class="umb-expansion-panel" ng-repeat="group in content.tabs">
 
-                  <umb-property property="property" ng-repeat="property in tab.properties">
-                     <umb-property-editor model="property"></umb-property-editor>
-                  </umb-property>
-
-                </umb-tab>
-            </umb-tabs-content>
+                <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
+                    <div>{{ group.label }}</div>
+                    <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !group.open, 'icon-navigation-up': group.open}" class="icon-navigation-right">&nbsp;</ins>
+                </div>
+        
+                <div class="umb-expansion-panel__content" ng-show="group.open">
+                    <umb-property data-element="property-{{group.alias}}" ng-repeat="property in group.properties track by property.alias" property="property">
+                        <umb-property-editor model="property"></umb-property-editor>
+                    </umb-property>
+                </div>
+        
+            </div>
 
          </umb-editor-container>
 
          <umb-editor-footer>
 
             <umb-editor-footer-content-left>
-               <umb-breadcrumbs ng-if="ancestors && ancestors.length > 0" ancestors="ancestors"></umb-breadcrumbs>
+                <umb-breadcrumbs 
+                  ng-if="ancestors && ancestors.length > 0" 
+                  ancestors="ancestors">
+                </umb-breadcrumbs>
             </umb-editor-footer-content-left>
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index cd086d575f..a29a5a9caa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -45,6 +45,11 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
                     editorState.set($scope.content);
 
+                    // set all groups to open
+                    angular.forEach($scope.content.tabs, function(group){
+                        group.open = true;
+                    });
+
                     $scope.page.loading = false;
 
                 });
@@ -59,6 +64,11 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
                     editorState.set($scope.content);
 
+                    // set all groups to open
+                    angular.forEach($scope.content.tabs, function(group){
+                        group.open = true;
+                    });
+
                     $scope.page.loading = false;
 
                 });