Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -rc21c3386cec2ee819ba267d84d532676d2f4990d -ra0f3adf1d8701263b284822c4fcb6661bb519dac
--- lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision c21c3386cec2ee819ba267d84d532676d2f4990d)
+++ lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision a0f3adf1d8701263b284822c4fcb6661bb519dac)
@@ -1634,8 +1634,8 @@
 <column alias="" auto-increment="false" column-size="4" decimal-digits="0" default-value="" mandatory="false" name="locale_id" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
@@ -1686,20 +1686,6 @@
 </foreign-key-figure>
 <foreign-key-column column-name="locale_id" referenced-key-column-name="locale_id"/>
 </foreign-key>
-<foreign-key alias="" name="FK_lams_organisation_6" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="lams_organisation" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="organisation_id" referenced-key-column-name="organisation_id"/>
-</foreign-key>
-<foreign-key alias="" name="FK_lams_organisation_7" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="lams_organisation" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="organisation_id" referenced-key-column-name="organisation_id"/>
-</foreign-key>
 </foreign-key-list>
 <index-list>
 <index alias="" name="PRIMARY" remarks="" unique="true">
@@ -2082,7 +2068,7 @@
 </foreign-key-figure>
 <foreign-key-column column-name="html_theme_id" referenced-key-column-name="theme_ve_id"/>
 </foreign-key>
-<foreign-key alias="" name="FK_lams_user_6" on-delete="" on-update="" referenced-key="PK_LAMS_SUPPORTED_LOCALE" referenced-table="lams_supported_locale" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_lams_user_6" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PK_LAMS_SUPPORTED_LOCALE" referenced-table="lams_supported_locale" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -5057,7 +5043,7 @@
 </table>
 <table alias="" name="lams_supported_locale" remarks="Describes the valid language/country combinations. Can't make language_iso_code and country_iso_code a unique key as MySQL considers that &quot;NULL=NULL&quot; is not true.">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1205" y="279"/>
+<table-figure-bounds height="-1" width="-1" x="1152" y="228"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="4" decimal-digits="0" default-value="" mandatory="true" name="locale_id" remarks="">
 <column-description></column-description>
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -rc21c3386cec2ee819ba267d84d532676d2f4990d -ra0f3adf1d8701263b284822c4fcb6661bb519dac
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision c21c3386cec2ee819ba267d84d532676d2f4990d)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision a0f3adf1d8701263b284822c4fcb6661bb519dac)
@@ -243,12 +243,6 @@
      , INDEX (locale_id)
      , CONSTRAINT FK_lams_organisation_5 FOREIGN KEY (locale_id)
                   REFERENCES lams_supported_locale (locale_id)
-     , INDEX (organisation_id)
-     , CONSTRAINT FK_lams_organisation_6 FOREIGN KEY (organisation_id)
-                  REFERENCES lams_organisation (organisation_id)
-     , INDEX (organisation_id)
-     , CONSTRAINT FK_lams_organisation_7 FOREIGN KEY (organisation_id)
-                  REFERENCES lams_organisation (organisation_id)
 )TYPE=InnoDB;
 
 CREATE TABLE lams_css_theme_ve (
@@ -312,7 +306,7 @@
      , flash_theme_id BIGINT(20)
      , html_theme_id BIGINT(20)
      , chat_id VARCHAR(255)
-     , locale_id BIGINT(20)
+     , locale_id TINYINT(4)
      , PRIMARY KEY (user_id)
      , INDEX (authentication_method_id)
      , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id)
@@ -326,7 +320,12 @@
      , INDEX (html_theme_id)
      , CONSTRAINT FK_lams_user_5 FOREIGN KEY (html_theme_id)
                   REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (locale_id)
+     , CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id)
+                  REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION
 )TYPE=InnoDB;
+ALTER TABLE lams_user MODIFY COLUMN chat_id VARCHAR(255)
+      COMMENT 'ID used for Jabber';
 CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC);
 CREATE INDEX login ON lams_user (login ASC);
 
Index: lams_common/db/sql/lams_user.sql
===================================================================
diff -u
--- lams_common/db/sql/lams_user.sql	(revision 0)
+++ lams_common/db/sql/lams_user.sql	(revision a0f3adf1d8701263b284822c4fcb6661bb519dac)
@@ -0,0 +1,48 @@
+CREATE TABLE lams_user (
+       user_id BIGINT(20) NOT NULL AUTO_INCREMENT
+     , login VARCHAR(20) NOT NULL
+     , password VARCHAR(50) NOT NULL
+     , title VARCHAR(32)
+     , first_name VARCHAR(64)
+     , last_name VARCHAR(128)
+     , address_line_1 VARCHAR(64)
+     , address_line_2 VARCHAR(64)
+     , address_line_3 VARCHAR(64)
+     , city VARCHAR(64)
+     , state VARCHAR(64)
+     , country VARCHAR(64)
+     , day_phone VARCHAR(64)
+     , evening_phone VARCHAR(64)
+     , mobile_phone VARCHAR(64)
+     , fax VARCHAR(64)
+     , email VARCHAR(128)
+     , disabled_flag TINYINT(1) NOT NULL DEFAULT 0
+     , create_date DATETIME NOT NULL
+     , authentication_method_id BIGINT(20) NOT NULL DEFAULT 0
+     , workspace_id BIGINT(20)
+     , flash_theme_id BIGINT(20)
+     , html_theme_id BIGINT(20)
+     , chat_id VARCHAR(255)
+     , locale_id TINYINT(4)
+     , PRIMARY KEY (user_id)
+     , INDEX (authentication_method_id)
+     , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id)
+                  REFERENCES lams_authentication_method (authentication_method_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (workspace_id)
+     , CONSTRAINT FK_lams_user_2 FOREIGN KEY (workspace_id)
+                  REFERENCES lams_workspace (workspace_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (flash_theme_id)
+     , CONSTRAINT FK_lams_user_4 FOREIGN KEY (flash_theme_id)
+                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (html_theme_id)
+     , CONSTRAINT FK_lams_user_5 FOREIGN KEY (html_theme_id)
+                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (locale_id)
+     , CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id)
+                  REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+)TYPE=InnoDB;
+ALTER TABLE lams_user MODIFY COLUMN chat_id VARCHAR(255)
+      COMMENT 'ID used for Jabber';
+CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC);
+CREATE INDEX login ON lams_user (login ASC);
+