Index: /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1230)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 1231)
@@ -1,3 +1,3 @@
-## Script (Python) "logged_in"
+z## Script (Python) "logged_in"
 ##bind container=container
 ##bind context=context
@@ -50,5 +50,5 @@
             d['phone'] = phone
             context.students_catalog.modifyRecord(**d)
-        if student_app is None:
+        elif student_app is None:
             context.waeup_tool.makeStudentData(str(member))
         student_app = getattr(student,'application',None)
Index: /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1230)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1231)
@@ -56,5 +56,5 @@
 Email address in personal data: %s
 Date of Birth: %s
-Password: 
+Password:
 
 """
Index: /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1230)
+++ /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1231)
@@ -2,5 +2,5 @@
     <metal:main fill-slot="main"
                 tal:define="member python:context.portal_membership.getAuthenticatedMember();
-                        info context/getMemberInfo;
+                            info context/getMemberInfo;
                         ">
       <span tal:condition="not: info">
@@ -70,7 +70,7 @@
       </form>
       </span>
-      <form action="." method="post" class="group">
-            <input type="submit" name="external_clearance_edit_form:method"
-                       class="context" value="Continue" />
+      <form tal:attributes="action string: ${context/portal_url}/campus/students" method="post" class="group">
+         <input type="submit" class="context" value="Next Student Id" />
+         <input name="id" type="text" size="8">
       </form>      
       </span>
