diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb
index ea4cbae..534898e 100644
--- a/Global_Indexer/ClassControls.vb
+++ b/Global_Indexer/ClassControls.vb
@@ -363,7 +363,7 @@ Public Class ClassControls
     End Sub
 
 
-    Public Function AddDateTimePicker(indexname As String, y As Integer, DataType As String) As DevExpress.XtraEditors.DateEdit
+    Public Function AddDateTimePicker(indexname As String, y As Integer, DataType As String, Vorgabe As String) As DevExpress.XtraEditors.DateEdit
         Dim oPicker As New DevExpress.XtraEditors.DateEdit With {
             .Name = "dtp" & indexname,
             .Size = New Size(260, 27),
@@ -373,6 +373,11 @@ Public Class ClassControls
                 .IndexType = DataType
             }
         }
+
+        If Vorgabe = "NULL" Then
+            oPicker.EditValue = Nothing
+        End If
+
         oPicker.Properties.AppearanceFocused.BackColor = Color.Lime
 
         Return oPicker
diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx
index 1b0a087..6277213 100644
--- a/Global_Indexer/frmAdministration.resx
+++ b/Global_Indexer/frmAdministration.resx
@@ -2892,13 +2892,13 @@ der Datei</value>
     <value>3, 162</value>
   </data>
   <data name="DEFAULT_VALUELabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 13</value>
+    <value>355, 13</value>
   </data>
   <data name="DEFAULT_VALUELabel.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
   </data>
   <data name="DEFAULT_VALUELabel.Text" xml:space="preserve">
-    <value>Default-Wert:</value>
+    <value>Default-Wert: (NULL für Date-Index, um Default Wert zu überschreiben)</value>
   </data>
   <data name="&gt;&gt;DEFAULT_VALUELabel.Name" xml:space="preserve">
     <value>DEFAULT_VALUELabel</value>
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 1e00fbd..bbfc347 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1694,7 +1694,7 @@ Public Class frmIndex
                             End If
                         End If
                     Case "DATE"
-                        Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType)
+                        Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType, DefaultValue)
                         pnlIndex.Controls.Add(oPicker)
 
                     Case Else
@@ -2181,6 +2181,7 @@ Public Class frmIndex
 
                                 If oIsOptional = True Then
                                     _Logger.Info("Optionaler Indexwert ist NICHT gefüllt")
+                                    DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, String.Empty)
                                 Else
                                     _Logger.Info(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!")
                                     Return True