diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb
index 1270d30..c558f11 100644
--- a/app/DD_Clipboard_Searcher/ClassInit.vb
+++ b/app/DD_Clipboard_Searcher/ClassInit.vb
@@ -1,6 +1,7 @@
 Imports System.ComponentModel
 Imports DD_LIB_Standards
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Language.Utils
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.EDMI.API
@@ -197,17 +198,18 @@ Public Class ClassInit
             If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
                 Logger.Info(">> Login Username: " & USER_USERNAME, False)
                 Logger.Info(">> Login time: " & Now.ToString, False)
-                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
-                USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
-                USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
-                USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
-                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
-                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
-                USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
 
-                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-                ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE")
+                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
+                USER_SURNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "")
+                USER_PRENAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"), "")
+                USER_SHORTNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "")
+                USER_EMAIL = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "")
+                USER_LANGUAGE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
+                USER_DATE_FORMAT = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy")
+                USER_IN_MODULE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False)
+                USER_IS_ADMIN = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False)
+                ADDITIONAL_TITLE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "")
+
                 If ADDITIONAL_TITLE = String.Empty Then
                     ADDITIONAL_TITLE = My.Application.Info.ProductName
                 End If
diff --git a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb
index 3311811..dcebe83 100644
--- a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb	
+++ b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb	
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Clipboard Watcher")>
 <Assembly: AssemblyCopyright("Copyright ©2021")>
-<Assembly: AssemblyTrademark("2300")>
+<Assembly: AssemblyTrademark("2304")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.0.1")>
+<Assembly: AssemblyVersion("2.3.0.4")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>