Index: /WAeUP_SRP/trunk/skins/waeup_layout/layout_application_view_info.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_layout/layout_application_view_info.pt	(revision 3866)
+++ /WAeUP_SRP/trunk/skins/waeup_layout/layout_application_view_info.pt	(revision 3867)
@@ -49,5 +49,5 @@
           </td>      
         </tr>   
-        <tr valign="top">
+        <tr tal:condition="info/student/email" valign="top">
           <td><span class="dlabel">Email</span>:
           </td>
@@ -55,6 +55,15 @@
             <span tal:content="info/student/email" />
           </td>      
-        </tr>         
-        <tr valign="top">
+        </tr>       
+        <tr tal:condition="not: info/student/email" 
+            tal:define="app_info context/getApplicationInfo;
+                        app_email app_info/app_doc/app_email|nothing" valign="top">
+          <td><span class="dlabel">Email</span>:
+          </td>
+          <td > 
+            <span tal:content="app_email" />
+          </td>      
+        </tr>              
+        <tr tal:condition="info/student/phone" valign="top">
           <td><span class="dlabel">Phone</span>:
           </td>
