Index: /WAeUP_SRP/base/skins/waeup_student/accommodation_slip.pt
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/accommodation_slip.pt	(revision 3115)
+++ /WAeUP_SRP/base/skins/waeup_student/accommodation_slip.pt	(revision 3116)
@@ -12,7 +12,6 @@
            
           <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
-    
-            <tr tal:condition="python: 'passport' in info_acco['student'].application.getContent().objectIds()">
-              <td colspan="2"><img tal:attributes="src string:${here/portal_url}/campus/students/${info_acco/id}/application/passport"/>
+            <tr tal:condition="python: here.waeup_tool.picturesExist(('passport',),info_acco['student_id'])"> 
+              <td colspan="2"><img tal:attributes="src string:${here/portal_url}/viewimage/${info_acco/student_id}/passport_${info_acco/student_id}.jpg"/>
               </td>
             </tr>   
Index: /WAeUP_SRP/uniben/waeup_custom/layout_student_acco_view_slip.pt
===================================================================
--- /WAeUP_SRP/uniben/waeup_custom/layout_student_acco_view_slip.pt	(revision 3115)
+++ /WAeUP_SRP/uniben/waeup_custom/layout_student_acco_view_slip.pt	(revision 3116)
@@ -15,4 +15,5 @@
   <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
     <tr tal:repeat="field fields">
+    <tal:block condition="widgets/field|nothing">
       <tal:block tal:define="cell python: widgets[field]">
         <tal:block define="widget cell/widget">
@@ -31,4 +32,5 @@
         </tal:block>
       </tal:block>
+      </tal:block>
     </tr>
   </table>
