diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb
index bf1acd3..cd37263 100644
--- a/Global_Indexer/ClassControls.vb
+++ b/Global_Indexer/ClassControls.vb
@@ -374,7 +374,7 @@ Public Class ClassControls
             }
         }
 
-        If Vorgabe.ToUpper = "NULL" Then
+        If Vorgabe.ToUpper = "$NULL" Then
             oPicker.EditValue = Nothing
         ElseIf Vorgabe IsNot Nothing Then
             oPicker.EditValue = Vorgabe
diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb
index 02e2259..58a577b 100644
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@@ -1314,7 +1314,7 @@ Public Class frmAdministration
                 Case 5 : oValue = "$DateDDMMYYY"
                 Case 6 : oValue = "$Username"
                 Case 7 : oValue = "$Usercode"
-                Case 8 : oValue = "NULL"
+                Case 8 : oValue = "$Null"
             End Select
 
             DEFAULT_VALUETextBox.Text = oValue