diff --git a/ToolCollection/frmNIVerknuepfungen.vb b/ToolCollection/frmNIVerknuepfungen.vb
index 154aa5a..8d85581 100644
--- a/ToolCollection/frmNIVerknuepfungen.vb
+++ b/ToolCollection/frmNIVerknuepfungen.vb
@@ -2439,6 +2439,7 @@ Public Class frmNIVerknuepfungen
                 Me._selectedProfil.finalerIndex = cmbIndex_Statusfertig.SelectedItem
                 If Not Me._selectedProfil.finalerIndex = Me._selectedProfil.OriginalfinalerIndex Then
                     Me._selectedProfil.setChanged()
+                    btnSaveAll.Enabled = True
                 End If
             End If
         End If
@@ -3652,7 +3653,24 @@ Public Class frmNIVerknuepfungen
             Case 2
                 If Me._selectedProfil IsNot Nothing Then
                     chbxStatusfertig.Checked = My.Settings.vNIStatusFinished
+                    cmbIndex_Statusfertig.Enabled = True
+                    Try
+                        Me.cmbIndex_Statusfertig.Items.Clear()
+                        Dim indexe = _windream.GetIndicesByObjecttype(Me._selectedProfil.Dokumenttyp.aName, True, "NI")
+                        If indexe IsNot Nothing Then
+                            For Each index As String In indexe
+                                Me.cmbIndex_Statusfertig.Items.Add(index)
+                            Next
+                        End If
+                        If Not IsNothing(Me._selectedProfil.finalerIndex) Then
+                            cmbIndex_Statusfertig.SelectedIndex = cmbIndex_Statusfertig.FindStringExact(Me._selectedProfil.finalerIndex)
+                        End If
 
+                        'Me._selectedProfil.setChanged()
+                        'Me.btnSaveAll.Enabled = True
+                    Catch ex As Exception
+                        MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der windream-Indexe in die Auswahlliste 'cmbIndex_Statusfertig'")
+                    End Try
                 End If
         End Select
     End Sub