Index: /WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 1454)
+++ /WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 1455)
@@ -2,5 +2,5 @@
     <metal:main fill-slot="main"
                 tal:define="member python:context.portal_membership.getAuthenticatedMember();
-                        info context/getApplicationInfo;
+                        info context/getStudentBaseInfo;
                         ">
       <span tal:condition="not: info">
@@ -11,8 +11,8 @@
       <h3>Contact Student</h3>
       <br />
-      <span tal:condition="not:info/app_doc/app_email"> 
+      <span tal:condition="not:info/student/email"> 
       Sorry, the student did not provide an email address.
       </span>
-      <span tal:condition="info/app_doc/app_email">
+      <span tal:condition="info/student/email">
       <form id="form1" name="form1" method="post" action="mail2student">
 
@@ -22,5 +22,5 @@
              tal:attributes="value python:member.getProperty('email',None)"/>             
       <input type="hidden" name="student_email" type="text" id="student_email"
-             tal:attributes="value info/app_doc/app_email"/>                   
+             tal:attributes="value info/student/email"/>                   
 
       <table width="100%" border="0" cellspacing="5" cellpadding="0">
@@ -30,5 +30,5 @@
           </td>
           <td>
-             <span tal:content="info/student/Title" />
+             <span tal:content="info/student/name" />
           </td>
         </tr>
@@ -38,5 +38,5 @@
           </td>
           <td>
-             <span tal:content="info/app_doc/app_email" />
+             <span tal:content="info/student/email" />
           </td>
         </tr>
Index: /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1454)
+++ /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1455)
@@ -28,5 +28,5 @@
           <td>
              <span tal:condition="info/student/Title" tal:content="info/student/Title" />
-             <span tal:condition="not:info/student/Title">na</span>
+             <span tal:condition="not:info/student/Title">N/A</span>
           </td>
         </tr>
Index: /WAeUP_SRP/trunk/skins/waeup_student/support_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/support_form.pt	(revision 1454)
+++ /WAeUP_SRP/trunk/skins/waeup_student/support_form.pt	(revision 1455)
@@ -1,3 +1,3 @@
-<metal:html tal:define="info context/getApplicationInfo;">
+<metal:html tal:define="info context/getStudentBaseInfo;">
   <span tal:condition="not: info">
     <span tal:content="here/illegal_view" />
@@ -18,5 +18,5 @@
           <td>
              <input name="fullname" type="text" id="fullname" 
-                    tal:attributes="value info/student/Title"/>
+                    tal:attributes="value info/student/name"/>
           </td>
         </tr>
@@ -27,5 +27,5 @@
           <td>
              <input name="email" type="text" id="email" 
-                    tal:attributes="value info/app_doc/app_email"/>
+                    tal:attributes="value info/student/email"/>
           </td>
         </tr>
