Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py	(revision 9397)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py	(revision 9398)
@@ -978,5 +978,4 @@
         # We can thus store utc.
         self.context.application_date = datetime.utcnow()
-        self.context.locked = True
         self.flash(_('Form has been submitted.'))
         self.redirect(self.url(self.context))
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 9397)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 9398)
@@ -80,4 +80,6 @@
         (success, msg) = self.applicant.createStudent()
         self.assertTrue('created' in msg)
+        # The applicant is locked
+        self.assertTrue(self.applicant.locked)
         student_id = translate(msg, 'waeup.kofa').split()[1]
         # View student container just created
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 9397)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 9398)
@@ -852,4 +852,5 @@
         self.browser.getControl("Save").click()
         # The form is locked.
+        self.assertTrue(self.applicant.locked)
         self.assertTrue(
             'The requested form is locked' in self.browser.contents)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py	(revision 9397)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py	(revision 9398)
@@ -186,4 +186,7 @@
     if event.transition.transition_id == 'create':
         msg += ' (%s)' % obj.student_id
+        obj.locked = True
+    if event.transition.transition_id == 'submit':
+        obj.locked = True
     history = IObjectHistory(obj)
     history.addMessage(msg)
