Index: /WAeUP_SRP/trunk/skins/waeup_student/change_password.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 1475)
+++ /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 1476)
@@ -18,7 +18,17 @@
 validate = request.has_key("change_password")
 students_dir = context.portal_directories.students
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+member_id = str(member)
 lt = context.portal_layouts
 wt = context.waeup_tool
-student_id = context.getStudentId()
+requested_id = context.getStudentId()
+if requested_id and not context.isStaff() and member_id != requested_id:
+    logger.info('"%s", "tried to access", "%s"' % (member_id,requested_id))
+    return None
+elif context.isStaff():
+    student_id = requested_id
+else:
+    student_id = member_id
 res,psm,ds = lt.renderLayout(layout_id= 'student_change_password',
                       schema_id= 'student_change_password',
