diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb
index d8c0fa8..04c35f7 100644
--- a/Global_Indexer/ClassInit.vb
+++ b/Global_Indexer/ClassInit.vb
@@ -210,22 +210,25 @@ Public Class ClassInit
                 Exit Sub
             End If
             If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
-                If DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") = 0 And IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")) Then
+
+                Dim oRow As DataRow = DT_CHECKUSER_MODULE.Rows(0)
+
+                If oRow.Item("USER_ID") = 0 And IsDBNull(oRow.Item("USER_SURNAME")) Then
                     LOGGER.Info("User '" & Environment.UserName & "' not configured in Useradministration!")
                     START_INCOMPLETE = True
                     Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
                     Exit Sub
                 End If
-                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                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_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-                USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                USER_IN_MODULE = oRow.Item("MODULE_ACCESS")
+                USER_ID = oRow.Item("USER_ID")
+                USER_SURNAME = IIf(IsDBNull(oRow.Item("USER_SURNAME")), "", oRow.Item("USER_SURNAME"))
+                USER_PRENAME = IIf(IsDBNull(oRow.Item("USER_PRENAME")), "", oRow.Item("USER_PRENAME"))
+                USER_SHORTNAME = IIf(IsDBNull(oRow.Item("USER_SHORTNAME")), "", oRow.Item("USER_SHORTNAME"))
+                USER_EMAIL = IIf(IsDBNull(oRow.Item("USER_EMAIL")), "", oRow.Item("USER_EMAIL"))
+                USER_LANGUAGE = oRow.Item("USER_LANGUAGE")
+                USER_IN_MODULE = oRow.Item("MODULE_ACCESS")
+                USER_IS_ADMIN = oRow.Item("IS_ADMIN")
+                USERCOUNT_LOGGED_IN = oRow.Item("USERCOUNT_LOGGED_IN")
                 ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
                 If USER_IN_MODULE = False Then
                     LOGGER.Info(" - User: " & Environment.UserName & " nicht für Modul freigegben!")
@@ -235,7 +238,7 @@ Public Class ClassInit
 
                     Exit Sub
                 End If
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
+                USER_IS_ADMIN = oRow.Item("IS_ADMIN")
 
                 ClassLicence.Refresh_Licence()
 
@@ -248,7 +251,7 @@ Public Class ClassInit
                         MsgBox("Your amount of configurable documenttypes is limited to " & LICENSE_DOCTYPE_COUNT.ToString & " doctypes. You can not add more doctypes!" & vbNewLine & "Please contact Digital Data for further licensedetails", MsgBoxStyle.Information)
                     End If
                 End If
-                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                USER_LANGUAGE = oRow.Item("USER_LANGUAGE")
 
                 oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
                 DATABASE_ECM.ExecuteNonQuery(oSql)