diff --git a/ChangeLog b/ChangeLog
index cba51f13346..2fb5387c179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ Dolibarr better:
   trigger ORDER_SUPPLIER_CREATE instead.
 - Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook development rules. They are
   "addreplace" hooks, so you must return content with "->resprints='mycontent'" and not with "return 'mycontent'"  
+- All fields "fk_societe" were renamed into "fk_soc".
 
 
 ***** ChangeLog for 3.7 compared to 3.6.* *****
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 53cf461fe37..9b6f1ce4651 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -581,8 +581,6 @@ alter table llx_facture_fourn_det add fk_unit integer default NULL;
 ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
 
 
-ALTER TABLE llx_user DROP INDEX uk_user_fk_societe;
-ALTER TABLE llx_user ADD INDEX idx_user_fk_societe   (fk_soc);
 
 
 -- Feature request: A page to merge two thirdparties into one #2613
@@ -594,7 +592,11 @@ ALTER TABLE llx_categorie_fournisseur DROP FOREIGN KEY fk_categorie_fournisseur_
 ALTER TABLE llx_categorie_fournisseur CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
 ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_fk_soc   FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
 
-ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
-ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
+ALTER TABLE llx_user DROP INDEX uk_user_fk_societe;
+ALTER TABLE llx_user DROP INDEX idx_user_fk_societe;
+ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER;
+ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
+
+