Index: main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7181)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7184)
@@ -33,5 +33,5 @@
 from waeup.sirp.browser.resources import datepicker, datatable, tabs
 from waeup.sirp.browser.viewlets import (
-    ManageActionButton, PrimaryNavTab, AddActionButton)
+    ManageActionButton, AddActionButton)
 from waeup.sirp.interfaces import (
     IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator)
@@ -80,20 +80,4 @@
     return
 
-class StudentsTab(PrimaryNavTab):
-    """Students tab in primary navigation.
-    """
-
-    grok.context(IWAeUPObject)
-    grok.order(4)
-    grok.require('waeup.viewStudent')
-    grok.template('primarynavtab')
-
-    pnav = 4
-    tab_title = u'Students'
-
-    @property
-    def link_target(self):
-        return self.view.application_url('students')
-
 class StudentsBreadcrumb(Breadcrumb):
     """A breadcrumb for the students container.
@@ -170,5 +154,5 @@
     grok.context(IStudentsContainer)
     grok.name('index')
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.viewStudents')
     grok.template('containerpage')
     label = 'Student Section'
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/permissions.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/permissions.py	(revision 7181)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/permissions.py	(revision 7184)
@@ -27,4 +27,7 @@
     grok.name('waeup.viewStudent')
 
+class ViewStudents(grok.Permission):
+    grok.name('waeup.viewStudents')
+
 class PayStudent(grok.Permission):
     grok.name('waeup.payStudent')
@@ -48,15 +51,15 @@
     grok.permissions('waeup.handleStudent', 'waeup.uploadStudentFile',
                      'waeup.viewStudent', 'waeup.payStudent',
-                     'waeup.handleAccommodation')
+                     'waeup.handleAccommodation', 'waeup.Authenticated')
 
 # Site Roles
 class StudentRole(grok.Role):
     grok.name('waeup.Student')
-    grok.permissions('waeup.Public', 'waeup.View')
+    grok.permissions('waeup.viewAcademics')
 
 class StudentsOfficer(grok.Role):
     grok.name('waeup.StudentsOfficer')
     grok.title(u'Students Officer (view only)')
-    grok.permissions('waeup.viewStudent',)
+    grok.permissions('waeup.viewStudent','waeup.viewStudents')
 
 class StudentsManager(grok.Role):
@@ -65,5 +68,5 @@
     grok.permissions('waeup.viewStudent', 'waeup.manageStudent',
                      'waeup.payStudent', 'waeup.uploadStudentFile',
-                     'waeup.handleAccommodation')
+                     'waeup.handleAccommodation', 'waeup.viewStudents')
 
 class StudentsClearanceOfficer(grok.Role):
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7181)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7184)
@@ -7,4 +7,5 @@
 from waeup.sirp.utils.helpers import string_from_bytes, file_size
 from waeup.sirp.browser import DEFAULT_IMAGE_PATH
+from waeup.sirp.browser.viewlets import PrimaryNavTab
 from waeup.sirp.students.browser import (
     StudentClearanceDisplayFormPage, StudentClearanceManageFormPage,
@@ -139,4 +140,20 @@
     text = u'History'
 
+class StudentsTab(PrimaryNavTab):
+    """Students tab in primary navigation.
+    """
+
+    grok.context(IWAeUPObject)
+    grok.order(4)
+    grok.require('waeup.viewStudents')
+    grok.template('primarynavtab')
+
+    pnav = 4
+    tab_title = u'Students'
+
+    @property
+    def link_target(self):
+        return self.view.application_url('students')
+
 class PrimaryStudentNavManager(grok.ViewletManager):
     """Viewlet manager for the primary navigation tab.
@@ -151,5 +168,5 @@
     grok.template('primarynavtab')
     grok.order(1)
-    grok.require('waeup.View')
+    grok.require('waeup.Authenticated')
     pnav = 0 
     tab_title = u'Some Text'
@@ -166,23 +183,23 @@
         return ''
 
-class HomeTab(PrimaryStudentNavTab):
-    """Home-tab in primary navigation.
-    """
-    grok.order(1)
-    grok.require('waeup.Public')
-    pnav = 0
-    tab_title = u'Home'
-
-class ProspectusTab(PrimaryStudentNavTab):
-    """Faculties-tab in primary navigation.
-    """
-    grok.order(2)
-    grok.require('waeup.View')
-    pnav = 1
-    tab_title = u'Prospectus'
-
-    @property
-    def link_target(self):
-        return self.view.application_url('faculties')
+#class HomeTab(PrimaryStudentNavTab):
+#    """Home-tab in primary navigation.
+#    """
+#    grok.order(1)
+#    grok.require('waeup.Authenticated')
+#    pnav = 0
+#    tab_title = u'Home'
+
+#class ProspectusTab(PrimaryStudentNavTab):
+#    """Faculties-tab in primary navigation.
+#    """
+#    grok.order(2)
+#    grok.require('waeup.viewAcademics')
+#    pnav = 1
+#    tab_title = u'Prospectus'
+
+#    @property
+#    def link_target(self):
+#        return self.view.application_url('faculties')
 
 class MyDataTab(PrimaryStudentNavTab):
@@ -190,5 +207,5 @@
     """
     grok.order(3)
-    grok.require('waeup.Public')
+    grok.require('waeup.Authenticated')
     pnav = 4
     tab_title = u'My Data'
