Index: /WAeUP_SRP/base/skins/waeup_student/getPersonalInfo.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/getPersonalInfo.py	(revision 3101)
+++ /WAeUP_SRP/base/skins/waeup_student/getPersonalInfo.py	(revision 3102)
@@ -16,24 +16,28 @@
 
 request = context.REQUEST
-mtool = context.portal_membership
-wf = context.portal_workflow
-member = mtool.getAuthenticatedMember()
-member_id = str(member)
-path_info = request.get('PATH_INFO').split('/')
-##from Products.zdb import set_trace
-##set_trace()
-if mtool.isAnonymousUser():
+# mtool = context.portal_membership
+# wf = context.portal_workflow
+# member = mtool.getAuthenticatedMember()
+# member_id = str(member)
+# path_info = request.get('PATH_INFO').split('/')
+# ##from Products.zdb import set_trace
+# ##set_trace()
+# if mtool.isAnonymousUser():
+#     return None
+# info = {}
+# requested_id = context.getStudentId()
+# if requested_id and not context.isStaff() and member_id != requested_id:
+#     logger.info('%s tried to access personal object of %s' % (member_id,requested_id))
+#     student_id = requested_id
+#     return None
+# elif context.isStaff():
+#     student_id = requested_id
+# else:
+#     student_id = member_id
+
+info = context.waeup_tool.getAccessInfo(context)
+student_id = info['student_id']
+if student_id is None:
     return None
-info = {}
-requested_id = context.getStudentId()
-if requested_id and not context.isStaff() and member_id != requested_id:
-    logger.info('%s tried to access personal object of %s' % (member_id,requested_id))
-    student_id = requested_id
-    return None
-elif context.isStaff():
-    student_id = requested_id
-else:
-    student_id = member_id
-
 
 students_object = context.portal_url.getPortalObject().campus.students
