diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 4d4248c1ac0..df86c80e72e 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -503,3 +503,6 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday aprouved','Executed when a holiday is aprouved','holiday',803);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
+
+-- VMYSQL4.3 ALTER TABLE llx_user MODIFY COLUMN fk_soc integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_user ALTER COLUMN fk_soc DROP NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql
index 047a10f1e90..f2250ccea75 100644
--- a/htdocs/install/mysql/tables/llx_user.key.sql
+++ b/htdocs/install/mysql/tables/llx_user.key.sql
@@ -21,7 +21,7 @@
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
 
-ALTER TABLE llx_user ADD INDEX idx_user_fk_societe  (fk_soc);
+ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member    (fk_member);
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 8aa0d381e26..6cfdf8bfbb8 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -64,12 +64,12 @@ create table llx_user
   --module_comm       smallint DEFAULT 1,
   --module_compta     smallint DEFAULT 1,
   
-  fk_soc			integer,					-- id thirdparty if user linked to a company (external user)
-  fk_socpeople      integer,					-- id contact origin if user linked to a contact
-  fk_member         integer,					-- if member if suer linked to a member
-  fk_user           integer,					-- Supervisor, hierarchic parent
-  fk_user_expense_validator           integer,
-  fk_user_holiday_validator           integer,
+  fk_soc			integer NULL,					-- id thirdparty if user linked to a company (external user)
+  fk_socpeople      integer NULL,					-- id contact origin if user linked to a contact
+  fk_member         integer NULL,					-- if member if suer linked to a member
+  fk_user           integer NULL,					-- Supervisor, hierarchic parent
+  fk_user_expense_validator           integer NULL,
+  fk_user_holiday_validator           integer NULL,
   
   idpers1			varchar(128),
   idpers2			varchar(128),
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c5103278dda..50ce988838c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -915,7 +915,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	$defaultemployee = '1';
 	print '<tr>';
 	print '<td>'.$langs->trans('Employee').'</td><td>';
-	print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : ($defaultemployee ? ' checked="checked"' : '')).'>';
+	print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : (($defaultemployee && !GETPOSTISSET('login')) ? ' checked="checked"' : '')).'>';
 	//print $form->selectyesno("employee", (GETPOST('employee') != '' ?GETPOST('employee') : $defaultemployee), 1);
 	print '</td></tr>';