Index: WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1281)
+++ WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1282)
@@ -11,8 +11,5 @@
       <h3>Mail Authentification Data</h3>
       <br />
-      <span tal:condition="not:info/email"> 
-      Sorry, the student did not provide an email address.
-      </span>
-      <span tal:condition="info/email">
+
       <form id="form1" name="form1" method="post" action="mail2student">
 
@@ -48,5 +45,5 @@
           <td>
               <select name="probtype" class="boxgreen" id="probtype">
-                <option>Your SRP Authentification Data</option>
+                <option>Your SRP Authentication Data</option>
                 <option>Your Password</option>
                 <option>Your Application PIN</option>
@@ -63,8 +60,16 @@
           </td>
         </tr>
-        <tr tal:condition="python: info['email']!='na'">
+        <tr tal:condition="python: info['email'] and info['email']!='na'">
           <td>&nbsp;</td>
           <td><input name="Submit" type="submit" class="standalone" value="Submit" /><br /><br /></td>
         </tr>
+
+        <tr tal:condition="not:info/email">
+          <td>&nbsp;</td>
+          <td><strong tal:condition="not:info/email"> 
+              The student did not provide an email address.
+              </strong>
+          </td>
+        </tr>        
       </table>
       </form>
@@ -74,5 +79,5 @@
          <input name="student_id" type="text" size="8">
       </form>      
-      </span>
+
     </metal:main>
 </metal:body>
