diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
index ae4196a7..6289873 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
@@ -97,12 +97,13 @@
         decideUpdated.connectOutputTo(PORT1, storeEditStatusUpdated);
         decideUpdated.connectOutputTo(PORT2, setEndDate);
         decideUpdated.connectOutputTo(PORT3, storeEditStatusCanceled);
-        setEndDate.connectOutputTo(rePublishToMailChannelsCompleted);
-        rePublishToMailChannelsCompleted.connectOutputTo(decidePublishedOnComplete);
+        setEndDate.connectOutputTo(decidePublishedOnComplete);
         decidePublishedOnComplete.connectOutputTo(YES, storePublicationStatusWithdrawn);
-        //for complete republishTask
+
+        //Benachrichtigungsemail bei Complete wenn schon einmal veröffentlicht
+        storePublicationStatusWithdrawn.connectOutputTo(rePublishToMailChannelsCompleted);
         decidePublishedOnComplete.connectOutputTo(NO, decideHasSubordinatedInfos);
-        storePublicationStatusWithdrawn.connectOutputTo(decideHasSubordinatedInfos);
+        rePublishToMailChannelsCompleted.connectOutputTo(decideHasSubordinatedInfos);
         decideHasSubordinatedInfos.connectOutputTo(NO, completedEndpoint);
         decideHasSubordinatedInfos.connectOutputTo(YES, storeEditStatusOfParentForChildren);
         storeEditStatusOfParentForChildren.connectOutputTo(completedEndpoint);
@@ -116,8 +117,9 @@
         storePublicationStatusPublished.connectOutputTo(updateMessage);
 
         storeEditStatusUpdated.connectOutputTo(resetPublishedFlagOnChannels);
+
+        //Benachrichtigungsemail bei Update
         resetPublishedFlagOnChannels.connectOutputTo(rePublishToMailChannelsUpdated);
-        //for updated republishTask
         rePublishToMailChannelsUpdated.connectOutputTo(qualifyMessage);
 
     }