diff --git a/Repositories/otago_eprints3/otago_eprints/cfg/workflows/user/default.xml b/Repositories/otago_eprints3/otago_eprints/cfg/workflows/user/default.xml
index e9862ef..ff87be0 100755
--- a/Repositories/otago_eprints3/otago_eprints/cfg/workflows/user/default.xml
+++ b/Repositories/otago_eprints3/otago_eprints/cfg/workflows/user/default.xml
@@ -3,73 +3,58 @@
 <workflow xmlns="http://eprints.org/ep3/workflow" xmlns:epc="http://eprints.org/ep3/control">
 
   <flow>
-    <epc:if test="usertype = 'user'">
-      <stage ref="default" />
-    </epc:if>
-    <epc:if test="usertype = 'editor'">
-      <stage ref="default" />
-    </epc:if>
-    <epc:if test="usertype = 'admin'">
-      <stage ref="default" />
-    </epc:if>
+    <epc:if test="$STAFF_ONLY = 'TRUE'"><stage ref="usertype"/></epc:if>
+    <stage ref="default"/>
   </flow>
-
-  <stage name="default">
-    <epc:if test="usertype = 'user'">
-      <component><field ref="password" /></component>
-      <component><field ref="hideemail" /></component>
-      <component><field ref="name" /></component>
-      <component><field ref="dept" /></component>
-      <component><field ref="org" /></component>
-      <component><field ref="address" /></component>
-      <component><field ref="country" /></component>
-      <component><field ref="os" /></component>
-      <component><field ref="url" /></component>
-      <epc:if test="$STAFF_ONLY = 'TRUE'">
-        <component><field ref="username" required="yes" /></component>
-        <component><field ref="usertype" required="yes" /></component>
-        <component><field ref="email" required="yes" /></component>
-      </epc:if>
-    </epc:if>
-    <epc:if test="usertype = 'editor'">
-      <component><field ref="password" /></component>
-      <component><field ref="hideemail" /></component>
-      <component><field ref="name" /></component>
-      <component><field ref="dept" /></component>
-      <component><field ref="org" /></component>
-      <component><field ref="address" /></component>
-      <component><field ref="country" /></component>
-      <component><field ref="os" /></component>
-      <component><field ref="url" /></component>
-      <component><field ref="frequency" /></component>
-      <component><field ref="mailempty" /></component>
-      <epc:if test="$STAFF_ONLY = 'TRUE'">
-        <component><field ref="editperms" /></component>
-        <component><field ref="username" required="yes" /></component>
-        <component><field ref="usertype" required="yes" /></component>
-        <component><field ref="email" required="yes" /></component>
-      </epc:if>
-    </epc:if>
-    <epc:if test="usertype = 'admin'">
-      <component><field ref="password" /></component>
-      <component><field ref="hideemail" /></component>
-      <component><field ref="name" /></component>
-      <component><field ref="dept" /></component>
-      <component><field ref="org" /></component>
-      <component><field ref="address" /></component>
-      <component><field ref="country" /></component>
-      <component><field ref="os" /></component>
-      <component><field ref="url" /></component>
-      <component><field ref="editperms" /></component>
-      <component><field ref="frequency" /></component>
-      <component><field ref="mailempty" /></component>
-      <epc:if test="$STAFF_ONLY = 'TRUE'">
-        <component><field ref="username" required="yes" /></component>
-        <component><field ref="usertype" required="yes" /></component>
-        <component><field ref="email" required="yes" /></component>
-      </epc:if>
-    </epc:if>
+   
+  <stage name="usertype">
+      <component><field ref="usertype"/></component>
+      <component><field ref="username"/></component>
   </stage>
 
-</workflow>
+  <stage name="default">
+    <component type="Field::Multi">
+      <title><epc:phrase ref="user_section_account" /></title>
+      <epc:if test="usertype != 'minuser'"><field ref="email"/></epc:if>
+      <field ref="hideemail"/>
+      <field ref="password"/>
+    </component>
 
+    <component type="Field::Multi">
+      <title><epc:phrase ref="user_section_personal" /></title>
+      <field ref="name" required="yes" />
+      <field ref="dept"/>
+      <field ref="org"/>
+      <field ref="address"/>
+      <field ref="country"/>
+      <field ref="url"/>
+    </component>
+
+    <epc:if test="usertype != 'minuser'">
+      <component type="Field::Multi">
+        <title><epc:phrase ref="user_section_prefs" /></title>
+        <field ref="items_fields"/>
+        <epc:if test="usertype = 'editor' or usertype = 'admin'"><field ref="review_fields" /></epc:if>
+      </component>
+    </epc:if>
+
+    <epc:if test="usertype = 'editor'">
+      <epc:if test="$STAFF_ONLY = 'TRUE'"><component><field ref="editperms"/></component></epc:if>
+      <component type="Field::Multi">
+        <title>Editorial Alerts</title>
+        <field ref="frequency" required="yes" />
+        <field ref="mailempty" required="yes" />
+      </component>
+    </epc:if>
+
+    <epc:if test="usertype = 'admin'">
+      <component><field ref="editperms" /></component>
+      <component type="Field::Multi">
+        <title>Editorial Alerts</title>
+        <field ref="frequency" required="yes" />
+        <field ref="mailempty" required="yes" />
+      </component>
+    </epc:if>
+
+  </stage>
+</workflow>