Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 15502)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 15503)
@@ -450,5 +450,5 @@
         # Temporarily enable passport upload also for cert and trans
         # applications.
-        if True: # not self.target[:4] in ('cert', 'tran'):
+        if self.context.__parent__.with_picture:
             if not store.getFileByContext(self.context, attr=u'passport.jpg'):
                 return _('No passport picture uploaded.')
Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicantdisplaypage.pt
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicantdisplaypage.pt	(revision 15502)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicantdisplaypage.pt	(revision 15503)
@@ -15,5 +15,6 @@
 </div>
 
-<img  src="" height="180px" tal:attributes="src view/passport_url" />
+<img tal:condition="python: context.__parent__.with_picture"
+     src="" height="180px" tal:attributes="src view/passport_url" />
 
 <table i18n:domain="waeup.kofa" class="form-table">
Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt	(revision 15502)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt	(revision 15503)
@@ -94,5 +94,7 @@
   </table>
 
-  <div tal:condition="python: not view.manage_applications and not view.target in ('trans', 'cert')">
+  <div tal:condition="python: not view.manage_applications
+                              and not view.target in ('trans', 'cert')
+                              and context.__parent__.with_picture">
     <input id="confirm_passport" name="confirm_passport"
            type="checkbox" value="True"/>&nbsp;&nbsp;
@@ -107,5 +109,7 @@
     </span>
   </div>
-  <div tal:condition="python: not view.manage_applications and view.target not in ('trans', 'cert')">
+  <div tal:condition="python: not view.manage_applications
+                              and view.target not in ('trans', 'cert')
+                              and context.__parent__.with_picture">
     <input id="confirm_passport" name="confirm_passport"
            type="checkbox" value="True"/>&nbsp;&nbsp;
