Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py	(revision 10357)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py	(revision 10358)
@@ -940,11 +940,11 @@
     grok.template('applicanteditpage')
     manage_applications = False
+    submit_state = PAID
 
     @property
     def display_actions(self):
         state = IWorkflowState(self.context).getState()
-        if state == INITIALIZED:
-            actions = [[],[]]
-        elif state == STARTED:
+        actions = [[],[]]
+        if state == STARTED:
             actions = [[_('Save')],
                 [_('Add online payment ticket'),_('Remove selected tickets')]]
@@ -952,6 +952,4 @@
             actions = [[_('Save'), _('Final Submit')],
                 [_('Remove selected tickets')]]
-        else:
-            actions = [[],[]]
         return actions
 
@@ -1019,5 +1017,5 @@
         # This shouldn't happen, but the application officer
         # might have forgotten to lock the form after changing the state
-        if state != PAID:
+        if state != self.submit_state:
             self.flash(_('The form cannot be submitted. Wrong state!'))
             return
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py	(revision 10357)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py	(revision 10358)
@@ -138,4 +138,5 @@
         source = CREATED,
         destination = STARTED),
+
     Transition(
         transition_id = 'reset5',
@@ -144,4 +145,5 @@
         source = SUBMITTED,
         destination = PAID),
+
     Transition(
         transition_id = 'reset6',
@@ -150,4 +152,5 @@
         source = PAID,
         destination = STARTED),
+
     Transition(
         transition_id = 'reset7',
