Index: /WAeUP_SRP/trunk/skins/waeup_student/student_edit.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 539)
+++ /WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 540)
@@ -41,6 +41,4 @@
 
 if context.portal_type == "Student":
-    if state == "application_pin_entered":
-        student.content_status_modify(workflow_action="apply_for_admission")
     if app_doc.passport is None:
         is_valid, ds = app_doc.validate(request=REQUEST,
@@ -49,5 +47,4 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-    
         action = "/passport_entry_view"
         if is_valid and app_doc.passport is not None:
@@ -76,4 +73,5 @@
     else:
         args = {}
+        student.content_status_modify(workflow_action="apply_for_admission")
         wftool.doActionFor(app,'close',dest_container= app)
         psm = 'You applied for admission.'
