Index: /WAeUP_SRP/trunk/__init__.py
===================================================================
--- /WAeUP_SRP/trunk/__init__.py	(revision 897)
+++ /WAeUP_SRP/trunk/__init__.py	(revision 898)
@@ -14,5 +14,4 @@
 import PatchCatalogToolXMLAdapter
 import PatchCPSSchemasAttributeStorageAdapter
-import PatchCPSUserFolderUserFolderWithGroups
 import PatchCPSUserFolderUserFolder
 import PatchBasicWidgetsCPSStringWidget
Index: /WAeUP_SRP/trunk/profiles/default/rolemap.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 897)
+++ /WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 898)
@@ -2,5 +2,5 @@
 <rolemap>
   <roles>
-    <role name="Staff"/>
+    <role name="SectionOfficer"/>
     <role name="ClearanceOfficer"/>
     <role name="Student"/>
@@ -12,4 +12,5 @@
     <permission name="List folder contents" acquire="True">
       <role name="SectionManager"/>
+      <role name="SectionOfficer"/>
       <role name="SectionReader"/>
       <role name="SectionOfficer"/>
@@ -37,4 +38,5 @@
     <permission name="List portal members" acquire="True">
       <role name="SectionManager"/>
+      <role name="SectionOfficer"/>
     </permission>
     <permission name="Review portal content" acquire="True">
@@ -50,7 +52,9 @@
     <permission name="Set own password" acquire="True">
       <role name="Member"/>
+      <role name="SectionOfficer"/>
     </permission>
     <permission name="Undo changes" acquire="False">
       <role name="SectionManager"/>
+      <role name="SectionOfficer"/>
     </permission>
     <permission name="Use mailhost services" acquire="True">
Index: /WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit.py	(revision 897)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit.py	(revision 898)
@@ -55,6 +55,6 @@
     psm = 'psm_content_error'
     args = getFormUidUrlArg(REQUEST)
-
-args['portal_status_message'] = psm
+if psm:
+    args['portal_status_message'] = psm
 url = context.absolute_url() + action + '?' + urlencode(args)
 REQUEST.RESPONSE.redirect(url)
