diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb
index 750c225..e9dd494 100644
--- a/app/DD_PM_WINDREAM/ClassInit.vb
+++ b/app/DD_PM_WINDREAM/ClassInit.vb
@@ -183,6 +183,7 @@ Public Class ClassInit
                             If LogErrorsOnly = False Then ClassLogger.Add(" >> Singe User-relation defined for user....", False)
                             USER_IN_MODULE = True
                             USER_IS_ADMIN = DT.Rows(0).Item("IS_ADMIN")
+                            USER_RIGHT_FILE_DELETE = DT.Rows(0).Item("RIGHT1")
                         End If
                     End If
                 End If
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
index 5bfbc13..0783ce5 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
@@ -15544,72 +15544,36 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [EMAIL], [ADDED_WHO], [AD"& _ 
-                "DED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COMMENT], [SHORTNAME]) VALUES (@PRENA"& _ 
-                "ME, @NAME, @USERNAME, @EMAIL, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WH"& _ 
-                "EN, @COMMENT, @SHORTNAME);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_W"& _ 
-                "HO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHE"& _ 
-                "RE (GUID = SCOPE_IDENTITY())"
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (PRENAME, NAME, USERNAME, EMAIL, "& _ 
+                "ADDED_WHO, COMMENT, SHORTNAME)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PRENAME,@NAME,@USERNAME,@EMAIL,@"& _ 
+                "ADDED_WHO,@COMMENT,@SHORTNAME); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, A"& _ 
+                "DDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_US"& _ 
+                "ER WHERE (GUID = SCOPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
-            Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNA"& _ 
-                "ME, [EMAIL] = @EMAIL, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHA"& _ 
-                "NGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COMMENT] = @COMMENT, "& _ 
-                "[SHORTNAME] = @SHORTNAME WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME "& _ 
-                "= 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAM"& _ 
-                "E = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Origi"& _ 
-                "nal_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Origin"& _ 
-                "al_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 "& _ 
-                "AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNul"& _ 
-                "l_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANG"& _ 
-                "ED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED"& _ 
-                "_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NUL"& _ 
-                "L) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAM"& _ 
-                "E] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAM"& _ 
-                "E, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, S"& _ 
-                "HORTNAME FROM TBDD_USER WHERE (GUID = @GUID)"
+            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                PRENAME = @PRENAME, NAME = @NAME, USER"& _ 
+                "NAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, COMMENT = @COMMENT"& _ 
+                ", SHORTNAME = @SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, P"& _ 
+                "RENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN,"& _ 
+                " COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PRENAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EMAIL", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -15636,11 +15600,15 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(1).Connection = Me.Connection
-            Me._commandCollection(1).CommandText = "SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, "& _ 
-                "T1.EMAIL, T1.GUID, T1.NAME, T1.PRENAME, T1.SHORTNAME, T1.USERNAME FROM TBDD_USER"& _ 
-                "_MODULES AS T INNER JOIN TBDD_USER AS T1 ON T.USER_ID = T1.GUID WHERE (T.MODULE_"& _ 
-                "ID = (SELECT GUID FROM TBDD_MODULES WHERE (SHORT_NAME = 'PM'))) AND (T.USER_ID N"& _ 
-                "OT IN (SELECT USER_ID FROM TBPM_PROFILE_USER WHERE (PROFIL_ID = @PROFILE_ID)))"
+            Me._commandCollection(1).CommandText = "SELECT        T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.EMAIL, T1.ADDED_WHO, "& _ 
+                "T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN, T1.COMMENT, T1.SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM  "& _ 
+                "          TBDD_USER_MODULES AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_USER "& _ 
+                "AS T1 ON T.USER_ID = T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (T.MODULE_ID ="&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                     "& _ 
+                "        (SELECT        GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               FROM            TBDD"& _ 
+                "_MODULES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               WHERE        (SHORT_NAME = 'PM'))) AND "& _ 
+                "(T.USER_ID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                             (SELECT        USER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"        "& _ 
+                "                       FROM            TBPM_PROFILE_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                      "& _ 
+                "         WHERE        (PROFIL_ID = @PROFILE_ID)))"
             Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
@@ -15814,7 +15782,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal COMMENT As String, ByVal SHORTNAME As String) As Integer
+        Public Overloads Overridable Function Insert(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal ADDED_WHO As String, ByVal COMMENT As String, ByVal SHORTNAME As String) As Integer
             If (PRENAME Is Nothing) Then
                 Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value
             Else
@@ -15840,30 +15808,15 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String)
             End If
-            If (ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
-            End If
-            If (CHANGED_WHO Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHO,String)
-            End If
-            If (CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.InsertCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value
-            End If
             If (COMMENT Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value
+                Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(8).Value = CType(COMMENT,String)
+                Me.Adapter.InsertCommand.Parameters(5).Value = CType(COMMENT,String)
             End If
             If (SHORTNAME Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value
+                Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.InsertCommand.Parameters(9).Value = CType(SHORTNAME,String)
+                Me.Adapter.InsertCommand.Parameters(6).Value = CType(SHORTNAME,String)
             End If
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
@@ -15884,29 +15837,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal PRENAME As String,  _
-                    ByVal NAME As String,  _
-                    ByVal USERNAME As String,  _
-                    ByVal EMAIL As String,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal COMMENT As String,  _
-                    ByVal SHORTNAME As String,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_PRENAME As String,  _
-                    ByVal Original_NAME As String,  _
-                    ByVal Original_USERNAME As String,  _
-                    ByVal Original_EMAIL As String,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_SHORTNAME As String,  _
-                    ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function Update(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal EMAIL As String, ByVal CHANGED_WHO As String, ByVal COMMENT As String, ByVal SHORTNAME As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
             If (PRENAME Is Nothing) Then
                 Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value
             Else
@@ -15927,104 +15858,23 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(3).Value = CType(EMAIL,String)
             End If
-            If (ADDED_WHO Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("ADDED_WHO")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHO,String)
-            End If
-            If (ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value
-            End If
             If (CHANGED_WHO Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value
+                Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHO,String)
-            End If
-            If (CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value
+                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String)
             End If
             If (COMMENT Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value
+                Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(8).Value = CType(COMMENT,String)
+                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(COMMENT,String)
             End If
             If (SHORTNAME Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value
+                Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value
             Else
-                Me.Adapter.UpdateCommand.Parameters(9).Value = CType(SHORTNAME,String)
+                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(SHORTNAME,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer)
-            If (Original_PRENAME Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PRENAME,String)
-            End If
-            If (Original_NAME Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(13).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(14).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(13).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_NAME,String)
-            End If
-            If (Original_USERNAME Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_USERNAME")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_USERNAME,String)
-            End If
-            If (Original_EMAIL Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(16).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(16).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_EMAIL,String)
-            End If
-            If (Original_ADDED_WHO Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_ADDED_WHO")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_ADDED_WHO,String)
-            End If
-            If (Original_ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(19).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(19).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value
-            End If
-            If (Original_CHANGED_WHO Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(21).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(22).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(21).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_CHANGED_WHO,String)
-            End If
-            If (Original_CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value
-            End If
-            If (Original_COMMENT Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(25).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(26).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(25).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_COMMENT,String)
-            End If
-            If (Original_SHORTNAME Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(27).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(28).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(27).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_SHORTNAME,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(29).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -16039,35 +15889,6 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 End If
             End Try
         End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal PRENAME As String,  _
-                    ByVal NAME As String,  _
-                    ByVal USERNAME As String,  _
-                    ByVal EMAIL As String,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal COMMENT As String,  _
-                    ByVal SHORTNAME As String,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_PRENAME As String,  _
-                    ByVal Original_NAME As String,  _
-                    ByVal Original_USERNAME As String,  _
-                    ByVal Original_EMAIL As String,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_SHORTNAME As String) As Integer
-            Return Me.Update(PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME, Original_GUID, Original_PRENAME, Original_NAME, Original_USERNAME, Original_EMAIL, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_COMMENT, Original_SHORTNAME, Original_GUID)
-        End Function
     End Class
     
     '''<summary>
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb
index d97a359..f73efe1 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb
@@ -15,6 +15,8 @@ Partial Public Class DD_DMSLiteDataSet
 End Class
 
 Namespace DD_DMSLiteDataSetTableAdapters
+    Partial Public Class TBDD_USERTableAdapter
+    End Class
 
     Partial Public Class TBPM_PROFILE_INDEXETableAdapter
     End Class
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
index 7d379ee..0f65181 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
@@ -443,20 +443,19 @@ WHERE        (GUID = 1)</CommandText>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [EMAIL], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COMMENT], [SHORTNAME]) VALUES (@PRENAME, @NAME, @USERNAME, @EMAIL, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @COMMENT, @SHORTNAME);
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBDD_USER
+                         (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, COMMENT, SHORTNAME)
+VALUES        (@PRENAME,@NAME,@USERNAME,@EMAIL,@ADDED_WHO,@COMMENT,@SHORTNAME); 
 SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SHORTNAME" ColumnName="SHORTNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -475,40 +474,21 @@ WHERE        (GUID IN
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNAME, [EMAIL] = @EMAIL, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COMMENT] = @COMMENT, [SHORTNAME] = @SHORTNAME WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Original_USERNAME) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)));
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>UPDATE       TBDD_USER
+SET                PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, COMMENT = @COMMENT, SHORTNAME = @SHORTNAME
+WHERE        (GUID = @Original_GUID); 
 SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COMMENT, SHORTNAME FROM TBDD_USER WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PRENAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_EMAIL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SHORTNAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="USERNAME" ColumnName="USERNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="USERNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="EMAIL" ColumnName="EMAIL" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@EMAIL" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="EMAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SHORTNAME" ColumnName="SHORTNAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@SHORTNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="SHORTNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_USER" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -531,7 +511,16 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO,
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByProfileId_NotAssigned" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByProfileId_NotAssigned" GeneratorSourceName="FillByProfileId_NotAssigned" GetMethodModifier="Public" GetMethodName="GetDataByProfileId_NotAssigned" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByProfileId_NotAssigned" UserSourceName="FillByProfileId_NotAssigned">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT T1.ADDED_WHEN, T1.ADDED_WHO, T1.CHANGED_WHEN, T1.CHANGED_WHO, T1.COMMENT, T1.EMAIL, T1.GUID, T1.NAME, T1.PRENAME, T1.SHORTNAME, T1.USERNAME FROM TBDD_USER_MODULES AS T INNER JOIN TBDD_USER AS T1 ON T.USER_ID = T1.GUID WHERE (T.MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE (SHORT_NAME = 'PM'))) AND (T.USER_ID NOT IN (SELECT USER_ID FROM TBPM_PROFILE_USER WHERE (PROFIL_ID = @PROFILE_ID)))</CommandText>
+                    <CommandText>SELECT        T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.EMAIL, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN, T1.COMMENT, T1.SHORTNAME
+FROM            TBDD_USER_MODULES AS T INNER JOIN
+                         TBDD_USER AS T1 ON T.USER_ID = T1.GUID
+WHERE        (T.MODULE_ID =
+                             (SELECT        GUID
+                               FROM            TBDD_MODULES
+                               WHERE        (SHORT_NAME = 'PM'))) AND (T.USER_ID NOT IN
+                             (SELECT        USER_ID
+                               FROM            TBPM_PROFILE_USER
+                               WHERE        (PROFIL_ID = @PROFILE_ID)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_ID" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFILE_ID" Precision="0" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -2103,7 +2092,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
   <xs:element name="DD_DMSLiteDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="DD_DMSLiteDataSet" msprop:Generator_UserDSName="DD_DMSLiteDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow">
+        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
@@ -2148,7 +2137,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow">
+        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PROFIL_ID" msprop:Generator_ColumnVarNameInTable="columnPROFIL_ID" msprop:Generator_ColumnPropNameInRow="PROFIL_ID" msprop:Generator_ColumnPropNameInTable="PROFIL_IDColumn" msprop:Generator_UserColumnName="PROFIL_ID" type="xs:int" />
@@ -2272,7 +2261,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow">
+        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -2368,7 +2357,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2433,7 +2422,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent" msprop:Generator_RowClassName="TBPM_TYPERow">
+        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_RowClassName="TBPM_TYPERow" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2463,7 +2452,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow">
+        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2486,7 +2475,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow">
+        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2576,7 +2565,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBDD_CONNECTIONRow">
+        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBDD_CONNECTIONRow" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2649,7 +2638,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_USERRow">
+        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_RowClassName="TBPROFILE_USERRow" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2698,7 +2687,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow">
+        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2713,7 +2702,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow">
+        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="USR_NAME" msprop:Generator_ColumnVarNameInTable="columnUSR_NAME" msprop:Generator_ColumnPropNameInRow="USR_NAME" msprop:Generator_ColumnPropNameInTable="USR_NAMEColumn" msprop:Generator_UserColumnName="USR_NAME" minOccurs="0">
@@ -2734,7 +2723,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILERow">
+        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_RowClassName="TBPM_PROFILERow" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2842,7 +2831,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBWH_CONNECTIONRow" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent">
+        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBWH_CONNECTIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2915,7 +2904,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent">
+        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2966,7 +2955,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3058,7 +3047,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent">
+        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3115,7 +3104,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPSRow">
+        <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPSRow" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3156,7 +3145,7 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_GROUP" msprop:Generator_TableClassName="TBPROFILE_GROUPDataTable" msprop:Generator_TableVarName="tableTBPROFILE_GROUP" msprop:Generator_RowChangedName="TBPROFILE_GROUPRowChanged" msprop:Generator_TablePropName="TBPROFILE_GROUP" msprop:Generator_RowDeletingName="TBPROFILE_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_GROUPRowDeleted" msprop:Generator_RowClassName="TBPROFILE_GROUPRow" msprop:Generator_UserTableName="TBPROFILE_GROUP" msprop:Generator_RowEvArgName="TBPROFILE_GROUPRowChangeEvent">
+        <xs:element name="TBPROFILE_GROUP" msprop:Generator_TableClassName="TBPROFILE_GROUPDataTable" msprop:Generator_TableVarName="tableTBPROFILE_GROUP" msprop:Generator_TablePropName="TBPROFILE_GROUP" msprop:Generator_RowDeletingName="TBPROFILE_GROUPRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_GROUPRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_GROUPRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_GROUPRowDeleted" msprop:Generator_UserTableName="TBPROFILE_GROUP" msprop:Generator_RowChangedName="TBPROFILE_GROUPRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_GROUPRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_GROUPRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3276,11 +3265,11 @@ VALUES        (@PROFIL_ID,@GROUP_ID,@WHO)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_ParentPropName="TBPM_TYPERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" />
+      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" msprop:Generator_ParentPropName="TBPM_TYPERow" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
index 755100a..54b8d12 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
@@ -4,23 +4,23 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="615" ViewPortY="66" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="207" ViewPortY="-101" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="15" X="1578" Y="-67" Height="383" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:VWPM_PROFILE_USER" ZOrder="1" X="1467" Y="331" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWPM_PROFILE_USER" ZOrder="2" X="1467" Y="331" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="23" X="-17" Y="232" Height="262" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
-    <Shape ID="DesignTable:TBDD_USER" ZOrder="5" X="207" Y="-100" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBDD_USER" ZOrder="1" X="207" Y="-101" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBPM_TYPE" ZOrder="10" X="17" Y="113" Height="203" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBPM_ERROR_LOG" ZOrder="14" X="443" Y="-87" Height="111" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="21" />
-    <Shape ID="DesignTable:VWPM_CONTROL_INDEX" ZOrder="2" X="1187" Y="316" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="3" X="410" Y="114" Height="186" Width="178" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="80" />
+    <Shape ID="DesignTable:VWPM_CONTROL_INDEX" ZOrder="3" X="1187" Y="316" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="4" X="410" Y="114" Height="186" Width="178" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="80" />
     <Shape ID="DesignTable:TBPROFILE_USER" ZOrder="6" X="509" Y="-80" Height="267" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:TBPM_PROFILE_FILES" ZOrder="16" X="1212" Y="-64" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:TBPM_FILES_USER_NOT_INDEXED" ZOrder="11" X="851" Y="-49" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:TBPM_PROFILE" ZOrder="12" X="215" Y="319" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBWH_CHECK_PROFILE_CONTROLS" ZOrder="19" X="0" Y="-72" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
     <Shape ID="DesignTable:TBPM_PROFILE_CONTROLS" ZOrder="8" X="595" Y="421" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="4" X="862" Y="109" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="5" X="862" Y="109" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="9" X="36" Y="431" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBPROFILE_GROUP" ZOrder="7" X="806" Y="-85" Height="286" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBWH_CONNECTION" ZOrder="20" X="625" Y="114" Height="276" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="272" />
diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
index aa07ebd..9875c8a 100644
--- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
+++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
@@ -27,6 +27,7 @@ Module ModuleRuntimeVariables
 
     Public USER_EXISTS = False
     Public USER_IN_MODULE = False
+    Public USER_RIGHT_FILE_DELETE As Boolean = False
     Public LICENSE_COUNT As Integer = 0
     Public LICENSE_EXPIRED As Boolean = False
     Public LICENSE_PROFILES As Integer = 0
@@ -53,6 +54,7 @@ Module ModuleRuntimeVariables
 
     Public CURRENT_DT_FINAL_INDEXING As DataTable
     Public CURRENT_DT_PROFILE As DataTable
+    Public CURRENT_DT_VW_PROFILE_USER As DataTable
 
     Public CURRENT_CONTROL_ID As Integer
 
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index db371e4..c0a86e7 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -752,6 +752,8 @@ Public Class frmMain
             Me.Visible = False
             CURRENT_ProfilGUID = ID
             CURRENT_ProfilName = ClassDatabase.Execute_Scalar("SELECT NAME FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID, MyConnectionString)
+            CURRENT_DT_PROFILE = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE where GUID = {0}", CURRENT_ProfilGUID))
+
             My.Settings.Save()
             If TimerRefresh.Enabled Then
                 TimerRefresh.Stop()
diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb
index 71d4548..1ba8200 100644
--- a/app/DD_PM_WINDREAM/frmMassValidator.vb
+++ b/app/DD_PM_WINDREAM/frmMassValidator.vb
@@ -4,7 +4,6 @@ Imports System.ComponentModel
 Imports DD_LIB_Standards
 
 Public Class frmMassValidator
-    Dim DT_PROFIL As DataTable
     Dim DT_PROFILE_CONTROLS As DataTable
 
     Private Delimiter As String
@@ -45,7 +44,6 @@ Public Class frmMassValidator
             Size = My.Settings.frmMassValidatorSize
         End If
         Try
-            DT_PROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
             DT_PROFILE_CONTROLS = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE CTRL_TYPE <> 'TABLE' AND SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = " & CURRENT_ProfilGUID)
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False)
         Catch ex As Exception
@@ -57,17 +55,17 @@ Public Class frmMassValidator
         ' Try
         Delimiter = CURRENT_DT_CONFIG.Rows(0).Item("VEKTOR_DELIMITER")
 
-        If DT_PROFIL.Rows.Count = 0 Then
+        If CURRENT_DT_PROFILE.Rows.Count = 0 Then
             ClassLogger.Add(">> Profildaten konnten nicht geladen werden - Übergebenes Profil: : " & CURRENT_ProfilName, True)
             MsgBox("Achtung: Profildaten konnten nicht übergeben oder geladen werden.", MsgBoxStyle.Critical, "Achtung:")
             Me.Close()
         End If
-        If DT_PROFIL.Rows.Count > 1 Then
+        If CURRENT_DT_PROFILE.Rows.Count > 1 Then
             MsgBox("Es wurden mehr als 1 Profil zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:")
             Me.Close()
         Else
-            If DT_PROFIL.Rows.Count <> 0 Then
-                For Each dr In DT_PROFIL.Rows
+            If CURRENT_DT_PROFILE.Rows.Count = 1 Then
+                For Each dr In CURRENT_DT_PROFILE.Rows
                     PROFIL_VEKTORINDEX = dr.Item("PM_VEKTOR_INDEX")
                     PROFIL_LOGINDEX = dr.Item("LOG_INDEX")
                     Me.Text = "Process Manager - " & dr.Item("TITLE")
@@ -928,7 +926,7 @@ Public Class frmMassValidator
 
                     Dim WORK_HISTORY_ENTRY = Nothing
                     Try
-                        WORK_HISTORY_ENTRY = DT_PROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
+                        WORK_HISTORY_ENTRY = CURRENT_DT_PROFILE.Rows(0).Item("WORK_HISTORY_ENTRY")
                         If IsDBNull(WORK_HISTORY_ENTRY) Then
                             WORK_HISTORY_ENTRY = Nothing
                         End If
@@ -1013,7 +1011,7 @@ Public Class frmMassValidator
                         '####### ANNOTIEREN WENN KONFIGURIERT #######
                         If docrow.Item("FULL_PATH").ToString.ToLower.EndsWith(".pdf") Then
                             If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                                If CBool(DT_PROFIL.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
+                                If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
                                     Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                                     Dim DT_ENTRY As DataTable = ClassDatabase.Return_Datatable(Sql, True)
                                     If Not IsNothing(DT_ENTRY) Then
@@ -1023,7 +1021,7 @@ Public Class frmMassValidator
                                         End If
                                     End If
                                 End If
-                                Dim value = DT_PROFIL.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
+                                Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
                                 If CBool(value) = True Then
                                     Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                                     Dim DT_ENTRIES As DataTable = ClassDatabase.Return_Datatable(Sql, True)
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 70ec216..dbf9d1b 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -19,8 +19,6 @@ Public Class frmValidator
     Dim PROFIL_sortbynewest As Boolean
     Dim PROFIL_VEKTORINDEX
     Dim PROFIL_LOGINDEX
-    Dim Right_Delete As Boolean
-    Dim DTPROFIL As DataTable
 
     Dim Delimiter As String
 
@@ -293,8 +291,9 @@ Public Class frmValidator
         If My.Settings.frmValidatorSize.IsEmpty = False Then
             Size = My.Settings.frmValidatorSize
         End If
+        Dim _step = 0
         Try
-            DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
+            _step = 1
             TBPM_FILES_USER_NOT_INDEXEDTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString
             TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
@@ -303,15 +302,15 @@ Public Class frmValidator
             TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPM_CONTROL_INDEXTableAdapter.Connection.ConnectionString = MyConnectionString
-            VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString
-            VWPM_PROFILE_USERTableAdapter.FillByName(DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName)
-
+            _step = 2
             VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName)
+            _step = 3
             TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
+            _step = 4
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False)
         Catch ex As Exception
-            MsgBox("Error LOADING profile-data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
+            MsgBox("Error LOADING profile-data(" & _step.ToString & "):" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
             allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error LOADING profile-data: " & ex.Message, Environment.UserName)
             ClassLogger.Add(">> Fehler in LOADING profile-data: " & ex.Message, True)
             Me.Close()
@@ -320,18 +319,17 @@ Public Class frmValidator
         Try
             Delimiter = TBPM_KONFIGURATIONTableAdapter.cmdGetDelimiter
 
-            Dim dt As DataTable = Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER
-            Dim dr As DataRow
-            If dt.Rows.Count = 0 Then
+
+            If CURRENT_DT_PROFILE.Rows.Count = 0 Then
                 ClassLogger.Add(">> Profildaten konnten nicht geladen werden - Übergebenes Profil: : " & CURRENT_ProfilName, True)
                 MsgBox("Achtung: Profildaten konnten nicht übergeben oder geladen werden.", MsgBoxStyle.Critical, "Achtung:")
                 Me.Close()
             End If
-            If dt.Rows.Count > 1 Then
-                MsgBox("Es wurden mehr als 1 Profil zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:")
+            If CURRENT_DT_PROFILE.Rows.Count > 1 Then
+                MsgBox("Es wurde mehr als 1 Profil (" & CURRENT_DT_PROFILE.Rows.Count & ") zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:")
             Else
-                If dt.Rows.Count <> 0 Then
-                    For Each dr In dt.Rows
+                If CURRENT_DT_PROFILE.Rows.Count = 1 Then
+                    For Each dr As DataRow In CURRENT_DT_PROFILE.Rows
                         PROFIL_VEKTORINDEX = dr.Item("PM_VEKTOR_INDEX")
                         PROFIL_LOGINDEX = dr.Item("LOG_INDEX")
                         Me.Text = "Process Manager - " & dr.Item("TITLE")
@@ -344,9 +342,25 @@ Public Class frmValidator
 
                         WD_Search = dr.Item("WD_SEARCH")
                         finalProfile = dr.Item("FINAL_PROFILE")
-                        Move2Folder = dr.Item("MOVE2Folder")
-                        Dim sql = String.Format("SELECT RIGHT1 FROM TBDD_USER_MODULES WHERE USER_ID = {0} AND MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'PM')", CURRENT_USER_ID)
-                        Right_Delete = CBool(ClassDatabase.Execute_Scalar(sql, MyConnectionString))
+                        Move2Folder = IIf(IsDBNull(dr.Item("MOVE2Folder")), "", dr.Item("MOVE2Folder"))
+                        Try
+                            If finalProfile = True Then
+
+                                Dim text As String = IIf(IsDBNull(dr.Item("FINAL_TEXT")), "", dr.Item("FINAL_TEXT"))
+                                If text <> "" Then
+                                    btnSave.Text = text & " (F1)"
+                                Else
+                                    btnSave.Text = "Validierung speichern - Nächstes  Dokument" & " (F1)"
+                                End If
+                            Else
+                                btnSave.Text = "Validierung speichern - Nächstes  Dokument" & " (F1)"
+                            End If
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Final profile Text geladen", False)
+                        Catch ex As Exception
+                            MsgBox("Error loading final profile text:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
+                            allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error loading final profile text: " & ex.Message, Environment.UserName)
+                            ClassLogger.Add(">> Fehler in loading final profile text: " & ex.Message, True)
+                        End Try
 
                         If CURRENT_JUMP_DOC_GUID <> 0 Then
                             Anzahl_ValDoks = 1
@@ -360,19 +374,19 @@ Public Class frmValidator
                         ClassLogger.Add(" >> WD_Search: " & WD_Search, False)
                         ClassLogger.Add(" >> finalProfile: " & finalProfile, False)
                         ClassLogger.Add(" >> Move2Folder: " & Move2Folder, False)
-                        ClassLogger.Add(" >> Right_Delete: " & Right_Delete, False)
+                        ClassLogger.Add(" >> Right_Delete: " & USER_RIGHT_FILE_DELETE, False)
                     End If
 
-                    PROFIL_sortbynewest = DTPROFIL.Rows(0).Item("SORT_BY_LATEST")
+                    PROFIL_sortbynewest = CURRENT_DT_PROFILE.Rows(0).Item("SORT_BY_LATEST")
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString, False)
                     'Delete Button anzeigen ja/nein
-                    If Right_Delete = True Then
+                    If USER_RIGHT_FILE_DELETE = True Then
                         ToolStripButtonDeleteFile.Enabled = True
                     Else
                         ToolStripButtonDeleteFile.Enabled = False
                     End If
 
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Right_Delete: " & Right_Delete.ToString, False)
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString, False)
                     Load_Controls()
 
 
@@ -380,30 +394,12 @@ Public Class frmValidator
             End If
 
         Catch ex As Exception
-            MsgBox("Error SAVING Profile-Data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
+            MsgBox("Error LOADING Profile-Data1:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
             allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error SAVING Profile-Data: " & ex.Message, Environment.UserName)
             ClassLogger.Add(">> Fehler in SAVING Profile-Data: " & ex.Message, True)
         End Try
         'Me.lblerror.Visible = False
-        Try
-            If finalProfile = True Then
 
-                Dim text As String = DTPROFIL.Rows(0).Item("FINAL_TEXT")
-                If text <> "" Then
-                    btnSave.Text = text & " (F1)"
-                Else
-                    btnSave.Text = "Validierung speichern - Nächstes  Dokument" & " (F1)"
-                End If
-            Else
-                btnSave.Text = "Validierung speichern - Nächstes  Dokument" & " (F1)"
-            End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Final profile Text geladen", False)
-        Catch ex As Exception
-            MsgBox("Error loading final profile text:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
-            allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error loading final profile text: " & ex.Message, Environment.UserName)
-            allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error loading final profile text " & ex.Message, Environment.UserName)
-            ClassLogger.Add(">> Fehler in loading final profile text: " & ex.Message, True)
-        End Try
     End Sub
 
     Sub LoadSimpleData(control As Control, controlId As Integer)
@@ -2095,7 +2091,7 @@ Public Class frmValidator
                 Dim WORK_HISTORY_ENTRY = Nothing
 
                 Try
-                    WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
+                    WORK_HISTORY_ENTRY = CURRENT_DT_PROFILE.Rows(0).Item("WORK_HISTORY_ENTRY")
                     If IsDBNull(WORK_HISTORY_ENTRY) Then
                         WORK_HISTORY_ENTRY = Nothing
                     End If
@@ -2183,7 +2179,7 @@ Public Class frmValidator
                 Close_document_viewer()
                 If Document_Path.ToLower.EndsWith(".pdf") Then
                     If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                        If CBool(DTPROFIL.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
+                        If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
                             sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                             Dim DT_ENTRY As DataTable = ClassDatabase.Return_Datatable(sql, True)
                             If Not IsNothing(DT_ENTRY) Then
@@ -2193,7 +2189,7 @@ Public Class frmValidator
                                 End If
                             End If
                         End If
-                        Dim value = DTPROFIL.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
+                        Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
                         If CBool(value) = True Then
                             sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                             Dim DT_ENTRIES As DataTable = ClassDatabase.Return_Datatable(sql, True)