Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 8374)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py	(revision 8375)
@@ -306,5 +306,6 @@
     role_manager.assignRoleToPrincipal(
         'waeup.Applicant', applicant.applicant_id)
-    IWorkflowInfo(applicant).fireTransition('init')
+    if applicant.state is None:
+        IWorkflowInfo(applicant).fireTransition('init')
 
     # Assign global applicant role for new applicant (alternative way)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py	(revision 8374)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/student.py	(revision 8375)
@@ -156,6 +156,5 @@
     message.
     """
-    state = IWorkflowState(student).getState()
-    if state == CLEARANCE:
+    if student.state == CLEARANCE:
         student.clearance_locked = False
     else:
@@ -174,5 +173,5 @@
     role_manager.assignRoleToPrincipal(
         'waeup.local.StudentRecordOwner', student.student_id)
-    if state is None:
+    if student.state is None:
         IWorkflowInfo(student).fireTransition('create')
     return
