Index: /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 6202)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 6203)
@@ -174,2 +174,18 @@
         site = grok.getSite()
         return site['users']
+
+@grok.subscribe(IUserAccount, grok.IObjectRemovedEvent)
+def handle_account_removal(account, event):
+    """When an account is removed, local roles might have to be deleted.
+    """
+    local_roles = account.getLocalRoles()
+    principal = account.name
+    for role_id, object_list in local_roles.items():
+        for object in object_list:
+            try:
+                role_manager = IPrincipalRoleManager(object)
+            except TypeError:
+                # No role manager, no roles to remove
+                continue
+            role_manager.unsetRoleForPrincipal(role_id, principal)
+    return
Index: /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 6202)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 6203)
@@ -120,4 +120,30 @@
    True
 
+When an account get deleted, also the local roles of the owner get
+removed. Let's setup a local role for `alice`:
+
+   >>> faculty = Faculty()
+   >>> root['app']['alice_fac'] = faculty
+   >>> role_manager = IPrincipalRoleManager(faculty)
+   >>> role_manager.assignRoleToPrincipal(
+   ...    'waeup.PortalManager', 'alice')
+   >>> notify(LocalRoleSetEvent(faculty, 'waeup.PortalManager', 'alice',
+   ...                          granted=True))
+
+The local role is set now:
+
+   >>> from zope.securitypolicy.interfaces import IPrincipalRoleMap
+   >>> IPrincipalRoleMap(faculty).getPrincipalsAndRoles()
+   [('waeup.PortalManager', 'alice', PermissionSetting: Allow)]
+
+But when we delete Alices account from ZODB:
+
+   >>> del root['app']['users']['alice']
+   >>> IPrincipalRoleMap(faculty).getPrincipalsAndRoles()
+   []
+
+the local role has gone.
+
+
 Logging in via side bar
 =======================
