Index: /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1912)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1913)
@@ -36,5 +36,5 @@
 is_anon = mtool.isAnonymousUser()
 member = mtool.getAuthenticatedMember()
-load_passport = hasattr(context.waeup_tool,'loadStudentFoto')
+#load_passport = hasattr(context.waeup_tool,'loadStudentFoto')
 
 if not is_anon:
@@ -90,5 +90,5 @@
 
         #from Products.zdb import set_trace;set_trace()
-        if s_review_state == 'returning' and load_passport and 'passport' not in app_doc.objectIds():
+        if s_review_state == 'returning' and 'passport' not in app_doc.objectIds():
             folder = 'pictures_returning'
             res = context.students_catalog(id = str(member))
@@ -96,5 +96,5 @@
             msg = context.waeup_tool.loadStudentFoto(student,filename,folder)
             logger.info('%s, %s' % (member,msg))
-        if s_review_state == 'admitted' and load_passport and 'passport' not in app_doc.objectIds():
+        if s_review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested')  and 'passport' not in app_doc.objectIds():
             folder = 'pictures_admitted_latest'
             filename = app_doc.jamb_reg_no.replace('/','_')
