Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt	(revision 9493)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt	(revision 9494)
@@ -217,5 +217,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<td>Applications Officer <br /></td>
+  ...<td>Applications Officer</td>
   ...
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9493)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9494)
@@ -481,5 +481,5 @@
             role_title = dict(get_all_roles())[site_role].title
             site_roles_string += '%s, <br />' % role_title
-        site_roles_string = site_roles_string.rstrip(', <br />')
+        site_roles_string = site_roles_string.replace(', <br />','')
         return site_roles_string
 
@@ -1663,4 +1663,7 @@
     @jsaction(_('Remove selected'))
     def delFaculties(self, **data):
+        if not checkPermission('waeup.managePortal', self.context):
+            self.flash(_('You are not allowed to remove entire faculties.'))
+            return
         delSubobjects(self, redirect='@@manage', tab='1')
         return
@@ -1764,4 +1767,7 @@
     @jsaction(_('Remove selected'))
     def delDepartments(self, **data):
+        if not checkPermission('waeup.managePortal', self.context):
+            self.flash(_('You are not allowed to remove entire departments.'))
+            return
         delSubobjects(self, redirect='@@manage', tab='2')
         return
@@ -1957,4 +1963,7 @@
     @jsaction(_('Remove selected certificates'))
     def delCertificates(self, **data):
+        if not checkPermission('waeup.managePortal', self.context):
+            self.flash(_('You are not allowed to remove certificates.'))
+            return
         delSubobjects(
             self, redirect='@@manage', tab='3', subcontainer='certificates')
