diff --git a/DDUserManager/DDUserManager/UserDataSet.Designer.vb b/DDUserManager/DDUserManager/UserDataSet.Designer.vb
index f93eb8e..602015e 100644
--- a/DDUserManager/DDUserManager/UserDataSet.Designer.vb
+++ b/DDUserManager/DDUserManager/UserDataSet.Designer.vb
@@ -11347,11 +11347,18 @@ Namespace UserDataSetTableAdapters
             Me._commandCollection(8).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._commandCollection(9) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(9).Connection = Me.Connection
-            Me._commandCollection(9).CommandText = "SELECT T.GUID FROM TBDD_USER T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"INNER JOIN TBDD_USER_MODULES T2 ON T.GUID = T2.US"& _ 
-                "ER_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"INNER JOIN TBDD_MODULES T3 ON T3.GUID = T2.MODULE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE T.USERNAME = "& _ 
-                "@USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'"
+            Me._commandCollection(9).CommandText = "SELECT        '1' AS Expr1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_USER AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"          "& _ 
+                "               TBDD_USER_MODULES AS T2 ON T.GUID = T2.USER_ID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"      "& _ 
+                "                   TBDD_MODULES AS T3 ON T3.GUID = T2.MODULE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (T"& _ 
+                ".USERNAME = @USERNAME) AND (T2.IS_ADMIN = 1) AND (T3.SHORT_NAME = 'UM')"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"UNION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
+                "SELECT        '1' AS Expr1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_GROUPS_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GROU"& _ 
+                "P_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_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               WHERE      "& _ 
+                "  (NAME = 'UM_ADMINS'))) AND (USER_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_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"           "& _ 
+                "                    WHERE        (UPPER(USERNAME) = UPPER(@USERNAME))))"
             Me._commandCollection(9).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(9).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._commandCollection(9).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(10) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(10).Connection = Me.Connection
             Me._commandCollection(10).CommandText = "SELECT GUID FROM TBDD_USER WHERE USERNAME = @USERNAME"
diff --git a/DDUserManager/DDUserManager/UserDataSet.xsd b/DDUserManager/DDUserManager/UserDataSet.xsd
index 38ef0c5..33778c7 100644
--- a/DDUserManager/DDUserManager/UserDataSet.xsd
+++ b/DDUserManager/DDUserManager/UserDataSet.xsd
@@ -980,12 +980,23 @@ VALUES        (@PRENAME,@NAME,@USERNAME,@EMAIL,@ADDED_WHO)</CommandText>
               <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_USER" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="IsUserManagerAdmin" Modifier="Public" Name="IsUserManagerAdmin" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="IsUserManagerAdmin">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT T.GUID FROM TBDD_USER T
-INNER JOIN TBDD_USER_MODULES T2 ON T.GUID = T2.USER_ID
-INNER JOIN TBDD_MODULES T3 ON T3.GUID = T2.MODULE_ID
-WHERE T.USERNAME = @USERNAME AND T2.IS_ADMIN = 1 AND T3.SHORT_NAME = 'UM'</CommandText>
+                    <CommandText>SELECT        '1' AS Expr1
+FROM            TBDD_USER AS T INNER JOIN
+                         TBDD_USER_MODULES AS T2 ON T.GUID = T2.USER_ID INNER JOIN
+                         TBDD_MODULES AS T3 ON T3.GUID = T2.MODULE_ID
+WHERE        (T.USERNAME = @USERNAME) AND (T2.IS_ADMIN = 1) AND (T3.SHORT_NAME = 'UM')
+UNION
+SELECT        '1' AS Expr1
+FROM            TBDD_GROUPS_USER
+WHERE        (GROUP_ID =
+                             (SELECT        GUID
+                               FROM            TBDD_GROUPS
+                               WHERE        (NAME = 'UM_ADMINS'))) AND (USER_ID =
+                             (SELECT        GUID
+                               FROM            TBDD_USER
+                               WHERE        (UPPER(USERNAME) = UPPER(@USERNAME))))</CommandText>
                     <Parameters>
-                      <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="false" AutogeneratedName="USERNAME" ColumnName="" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@USERNAME" Precision="0" Scale="0" Size="50" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1162,7 +1173,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
   <xs:element name="UserDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="UserDataSet" msprop:Generator_UserDSName="UserDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <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" />
@@ -1203,7 +1214,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow">
+        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent">
           <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" />
@@ -1235,7 +1246,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_MODULESRow">
+        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_MODULESRow" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent">
           <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" />
@@ -1339,7 +1350,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER_MODULES" msprop:Generator_TableClassName="TBDD_USER_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_USER_MODULES" msprop:Generator_TablePropName="TBDD_USER_MODULES" msprop:Generator_RowDeletingName="TBDD_USER_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_USER_MODULES" msprop:Generator_RowChangedName="TBDD_USER_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_USER_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_USER_MODULESRow">
+        <xs:element name="TBDD_USER_MODULES" msprop:Generator_TableClassName="TBDD_USER_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_USER_MODULES" msprop:Generator_RowChangedName="TBDD_USER_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_USER_MODULES" msprop:Generator_RowDeletingName="TBDD_USER_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_USER_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USER_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USER_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_USER_MODULESRow" msprop:Generator_UserTableName="TBDD_USER_MODULES" msprop:Generator_RowEvArgName="TBDD_USER_MODULESRowChangeEvent">
           <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" />
@@ -1364,7 +1375,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_CLIENTRow">
+        <xs:element name="TBDD_CLIENT" msprop:Generator_TableClassName="TBDD_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT" msprop:Generator_RowChangedName="TBDD_CLIENTRowChanged" msprop:Generator_TablePropName="TBDD_CLIENT" msprop:Generator_RowDeletingName="TBDD_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENTRowDeleted" msprop:Generator_RowClassName="TBDD_CLIENTRow" msprop:Generator_UserTableName="TBDD_CLIENT" msprop:Generator_RowEvArgName="TBDD_CLIENTRowChangeEvent">
           <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" />
@@ -1429,7 +1440,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CLIENT_USER" msprop:Generator_TableClassName="TBDD_CLIENT_USERDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT_USER" msprop:Generator_TablePropName="TBDD_CLIENT_USER" msprop:Generator_RowDeletingName="TBDD_CLIENT_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENT_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENT_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENT_USERRowDeleted" msprop:Generator_UserTableName="TBDD_CLIENT_USER" msprop:Generator_RowChangedName="TBDD_CLIENT_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_CLIENT_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_CLIENT_USERRow">
+        <xs:element name="TBDD_CLIENT_USER" msprop:Generator_TableClassName="TBDD_CLIENT_USERDataTable" msprop:Generator_TableVarName="tableTBDD_CLIENT_USER" msprop:Generator_RowChangedName="TBDD_CLIENT_USERRowChanged" msprop:Generator_TablePropName="TBDD_CLIENT_USER" msprop:Generator_RowDeletingName="TBDD_CLIENT_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_CLIENT_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CLIENT_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CLIENT_USERRowDeleted" msprop:Generator_RowClassName="TBDD_CLIENT_USERRow" msprop:Generator_UserTableName="TBDD_CLIENT_USER" msprop:Generator_RowEvArgName="TBDD_CLIENT_USERRowChangeEvent">
           <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" />
@@ -1453,7 +1464,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </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" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1552,7 +1563,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBLOCAL_ADUSERS" msprop:Generator_TableClassName="TBLOCAL_ADUSERSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADUSERS" msprop:Generator_TablePropName="TBLOCAL_ADUSERS" msprop:Generator_RowDeletingName="TBLOCAL_ADUSERSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADUSERSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADUSERSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADUSERSRowDeleted" msprop:Generator_UserTableName="TBLOCAL_ADUSERS" msprop:Generator_RowChangedName="TBLOCAL_ADUSERSRowChanged" msprop:Generator_RowEvArgName="TBLOCAL_ADUSERSRowChangeEvent" msprop:Generator_RowClassName="TBLOCAL_ADUSERSRow">
+        <xs:element name="TBLOCAL_ADUSERS" msprop:Generator_TableClassName="TBLOCAL_ADUSERSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADUSERS" msprop:Generator_RowChangedName="TBLOCAL_ADUSERSRowChanged" msprop:Generator_TablePropName="TBLOCAL_ADUSERS" msprop:Generator_RowDeletingName="TBLOCAL_ADUSERSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADUSERSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADUSERSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADUSERSRowDeleted" msprop:Generator_RowClassName="TBLOCAL_ADUSERSRow" msprop:Generator_UserTableName="TBLOCAL_ADUSERS" msprop:Generator_RowEvArgName="TBLOCAL_ADUSERSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="USERNAME" msprop:Generator_ColumnVarNameInTable="columnUSERNAME" msprop:Generator_ColumnPropNameInRow="USERNAME" msprop:Generator_ColumnPropNameInTable="USERNAMEColumn" msprop:Generator_UserColumnName="USERNAME" type="xs:string" minOccurs="0" />
@@ -1562,14 +1573,14 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBLOCAL_ADGROUPS" msprop:Generator_TableClassName="TBLOCAL_ADGROUPSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADGROUPS" msprop:Generator_RowChangedName="TBLOCAL_ADGROUPSRowChanged" msprop:Generator_TablePropName="TBLOCAL_ADGROUPS" msprop:Generator_RowDeletingName="TBLOCAL_ADGROUPSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADGROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADGROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADGROUPSRowDeleted" msprop:Generator_RowClassName="TBLOCAL_ADGROUPSRow" msprop:Generator_UserTableName="TBLOCAL_ADGROUPS" msprop:Generator_RowEvArgName="TBLOCAL_ADGROUPSRowChangeEvent">
+        <xs:element name="TBLOCAL_ADGROUPS" msprop:Generator_TableClassName="TBLOCAL_ADGROUPSDataTable" msprop:Generator_TableVarName="tableTBLOCAL_ADGROUPS" msprop:Generator_TablePropName="TBLOCAL_ADGROUPS" msprop:Generator_RowDeletingName="TBLOCAL_ADGROUPSRowDeleting" msprop:Generator_RowChangingName="TBLOCAL_ADGROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBLOCAL_ADGROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBLOCAL_ADGROUPSRowDeleted" msprop:Generator_UserTableName="TBLOCAL_ADGROUPS" msprop:Generator_RowChangedName="TBLOCAL_ADGROUPSRowChanged" msprop:Generator_RowEvArgName="TBLOCAL_ADGROUPSRowChangeEvent" msprop:Generator_RowClassName="TBLOCAL_ADGROUPSRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GROUPNAME" msprop:Generator_ColumnVarNameInTable="columnGROUPNAME" msprop:Generator_ColumnPropNameInRow="GROUPNAME" msprop:Generator_ColumnPropNameInTable="GROUPNAMEColumn" msprop:Generator_UserColumnName="GROUPNAME" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_MODULES" msprop:Generator_TableClassName="TBDD_GROUPS_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_MODULES" msprop:Generator_TablePropName="TBDD_GROUPS_MODULES" msprop:Generator_RowDeletingName="TBDD_GROUPS_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_MODULES" msprop:Generator_RowChangedName="TBDD_GROUPS_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_MODULESRow">
+        <xs:element name="TBDD_GROUPS_MODULES" msprop:Generator_TableClassName="TBDD_GROUPS_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_MODULES" msprop:Generator_RowChangedName="TBDD_GROUPS_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_MODULES" msprop:Generator_RowDeletingName="TBDD_GROUPS_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_MODULESRow" msprop:Generator_UserTableName="TBDD_GROUPS_MODULES" msprop:Generator_RowEvArgName="TBDD_GROUPS_MODULESRowChangeEvent">
           <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" />
@@ -1601,7 +1612,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_CLIENT" msprop:Generator_TableClassName="TBDD_GROUPS_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_CLIENT" msprop:Generator_TablePropName="TBDD_GROUPS_CLIENT" msprop:Generator_RowDeletingName="TBDD_GROUPS_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_CLIENTRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_CLIENT" msprop:Generator_RowChangedName="TBDD_GROUPS_CLIENTRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_CLIENTRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_CLIENTRow">
+        <xs:element name="TBDD_GROUPS_CLIENT" msprop:Generator_TableClassName="TBDD_GROUPS_CLIENTDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_CLIENT" msprop:Generator_RowChangedName="TBDD_GROUPS_CLIENTRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_CLIENT" msprop:Generator_RowDeletingName="TBDD_GROUPS_CLIENTRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_CLIENTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_CLIENTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_CLIENTRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_CLIENTRow" msprop:Generator_UserTableName="TBDD_GROUPS_CLIENT" msprop:Generator_RowEvArgName="TBDD_GROUPS_CLIENTRowChangeEvent">
           <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" />
@@ -1674,16 +1685,16 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
-      <msdata:Relationship name="FK_TBDD_USER_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_ParentPropName="TBDD_MODULESRow" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" />
-      <msdata:Relationship name="FK_TBDD_CLIENT_USER_GROUP_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_ParentPropName="TBDD_CLIENTRow" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
-      <msdata:Relationship name="FK_TBDD_USER_MODULES2_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
-      <msdata:Relationship name="FK_TBDD_CLIENT_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_ParentPropName="TBDD_MODULESRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_ParentPropName="TBDD_CLIENTRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_ParentPropName="TBDD_GROUPSRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
+      <msdata:Relationship name="FK_TBDD_USER_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" msprop:Generator_ParentPropName="TBDD_MODULESRow" />
+      <msdata:Relationship name="FK_TBDD_CLIENT_USER_GROUP_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_GROUP_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" msprop:Generator_ParentPropName="TBDD_CLIENTRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <msdata:Relationship name="FK_TBDD_USER_MODULES2_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_USER_MODULES" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_USER_MODULES" msprop:Generator_ChildPropName="GetTBDD_USER_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_USER_MODULES2_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <msdata:Relationship name="FK_TBDD_CLIENT_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_CLIENT_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_CLIENT_USER" msprop:Generator_ChildPropName="GetTBDD_CLIENT_USERRows" msprop:Generator_UserRelationName="FK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_CLIENT_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_MODULES_MODULE_ID" msdata:parent="TBDD_MODULES" msdata:child="TBDD_GROUPS_MODULES" msdata:parentkey="GUID" msdata:childkey="MODULE_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_MODULES" msprop:Generator_ChildPropName="GetTBDD_GROUPS_MODULESRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_MODULES_MODULE_ID" msprop:Generator_UserParentTable="TBDD_MODULES" msprop:Generator_ParentPropName="TBDD_MODULESRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msdata:parent="TBDD_CLIENT" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="CLIENT_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_CLIENT_ID" msprop:Generator_UserParentTable="TBDD_CLIENT" msprop:Generator_ParentPropName="TBDD_CLIENTRow" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msdata:parent="TBDD_GROUPS" msdata:child="TBDD_GROUPS_CLIENT" msdata:parentkey="GUID" msdata:childkey="GROUP_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_CLIENT" msprop:Generator_ChildPropName="GetTBDD_GROUPS_CLIENTRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_CLIENT_GROUP_ID" msprop:Generator_UserParentTable="TBDD_GROUPS" msprop:Generator_ParentPropName="TBDD_GROUPSRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/DDUserManager/DDUserManager/UserDataSet.xss b/DDUserManager/DDUserManager/UserDataSet.xss
index 8ee7b56..8d453f8 100644
--- a/DDUserManager/DDUserManager/UserDataSet.xss
+++ b/DDUserManager/DDUserManager/UserDataSet.xss
@@ -4,7 +4,7 @@
      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="284" ViewPortY="-428" 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="-10" ViewPortY="-64" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="6" X="813" Y="-19" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="810" Y="357" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
@@ -12,7 +12,7 @@
     <Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="2" X="1142" Y="58" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:TBDD_CLIENT" ZOrder="13" X="478" Y="-418" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="7" X="80" Y="42" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBDD_USER" ZOrder="5" X="461" Y="-16" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
+    <Shape ID="DesignTable:TBDD_USER" ZOrder="5" X="461" Y="-16" Height="554" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="296" />
     <Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="12" X="1142" Y="-286" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="9" X="783" Y="-302" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="1" X="136" Y="-222" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />