diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb
index 3f86fd31..f600e584 100644
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@@ -9,8 +9,8 @@
         EnvelopeSent = 1004 ' Nicht verwendet
         EnvelopePartlySigned = 1005
         EnvelopeCompletelySigned = 1006
-        EnvelopeArchived = 1007
-        EnvelopeTransmittedDMS = 1008
+        EnvelopeReportCreated = 1007
+        EnvelopeArchived = 1008
         EnvelopeDeleted = 1009
         AccessCodeRequested = 2001
         AccessCodeCorrect = 2002
diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
index 55f9b6f7..3599fdc6 100644
--- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -119,6 +119,11 @@ Namespace Jobs
                         Throw New ApplicationException("Document could not be finalized")
                     End If
 
+                    If ActionService.CreateReport(oEnvelope) = False Then
+                        Logger.Warn("Document Report could not be created!")
+                        Throw New ApplicationException("Document Report could not be created")
+                    End If
+
                     Logger.Debug("Creating report..")
                     Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
                     Logger.Debug("Report created.")
diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb
index f2b600a6..b0b44291 100644
--- a/EnvelopeGenerator.Common/Services/ActionService.vb
+++ b/EnvelopeGenerator.Common/Services/ActionService.vb
@@ -124,4 +124,12 @@ Public Class ActionService
         Return EmailService.SendDocumentCompletedEmailToCreator(pEnvelope, pAttachment)
     End Function
 
+    Public Function CreateReport(pEnvelope As Envelope) As Boolean
+        If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeReportCreated, "System") = False Then
+            Return False
+        End If
+
+        Return True
+    End Function
+
 End Class
\ No newline at end of file