diff --git a/.mailmap b/.mailmap
index 5452dfd7eced6227342e38c1daee5fa6187254da..e8821f0f8ebb504219a825e119af941654b6375d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,6 @@
+# This is mapping list between real user name/email and entry into sources files
+# If you don't want to have your real email appears here, just send a Pull Request to
+# replace the second field between <> with <secret>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <eldy@users.sourceforge.net>
 Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
@@ -47,3 +50,42 @@ Cédric Gross <c.gross@kreiz-it.fr> Cedric <c.gross@kreiz-it.fr>
 Cédric Gross <c.gross@kreiz-it.fr> Cedric GROSS <c.gross@kreiz-it.fr>
 Jean Heimburger <jean@tiaris.info> jean <jean@tiaris.info>
 Jean Heimburger <jean@tiaris.info> tiaris <tiaris>
+Benoit Mortier <benoit.mortier@opensides.be> opensides <opensides>
+Eric Seigne <contact@ryxeo.com> erics <erics>
+Jean-Louis Bergamo <jl@bergamo.fr> jlb <jlb>
+Remco Gerbrands <remco@artoge.nl> r2gnl <r2gnl>
+Phf <phf@atm-consulting.fr> phf <phf@atm-consulting.fr>
+Yannick Warnier <ywarnier@beeznest.org> ywarnier <ywarnier>
+Jerome Warnier <jwarnier@beeznest.org> jwarnier <jwarnier>
+Franky Van Liedekerke <liedekef@telenet.be> liedekef <liedekef>
+Lalaina Rasamoelina <lalaina.rasamoelina@biblibre.com> lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
+Marc Ocebo <marc_ocebo> marc_ocebo <marc_ocebo>
+Unknown <secret> box7890 <box7890>
+Unknown <secret> beedauchon <beedauchon>
+Loic <secret> loic <loic>
+Christophe Combelle <ccomb>
+Unknown <secret> activdev <activdev>
+Unknown <secret> bouba <bouba>
+Unknown <secret> bcroq <bcroq>
+Unknown <secret> dutoit <dutoit>
+Unknown <secret> bureau2crea <bureau2crea>
+Unknown <secret> unknown <mne02@.modula71.local>
+Simon Tosser <secret> simontosser <simontosser>
+Unknown <secret> tipaul <tipaul>
+Raphaël Bertrand <secret> raphael_bertrand <raphael_bertrand>
+Claudio Aschieri <c.aschieri@19.coop> cla <c.aschieri@19.coop>
+Tommaso Basilici <t.basilici@19.coop> kaos <t.basilici@19.coop>
+Tommaso Basilici <t.basilici@19.coop> Tommaso Basilici <t.basilici@19.coop>
+Faust <faust@19.coop> faust <faust@19.coop>
+Ferran Marcet <secret> fmarcet <fmarcet@imedia>
+Geoffrey Girard <geoffre.girard@atm-consulting.fr> geoffrey.girard <geoffre.girard@atm-consulting.fr>
+Bernard Paquier <eshop.bpaquier@gmail.com> BadPixxel <eshop.bpaquier@gmail.com>
+Patrick Delcroix <delcroip@gmail.com> delcroix Patrick <delcroip@gmail.com>
+Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.info>
+Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.com>
+Grégory David <groolot@groolot.net> Grégory DAVID <groolot@groolot.net>
+Grégory David <groolot@groolot.net> Gregory DAVID <groolot@groolot.net>
+Baffir Abbes <bafbes@users.noreply.github.com> bafbes <bafbes@users.noreply.github.com>
+Kevin Guerrier <guerrier.k@gmail.com> GUERRIER Kevin <guerrier.k@gmail.com>
+Remy Younes <ryounes@gmail.com> remy <ryounes@gmail.com>
+Estephe Loridan <github@estephe.me> Estephe L. <github@estephe.me>
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 1e171737a6b67dd93337c3e55ac48b76b7d4cc5d..4e0c0ba58cafddb12d83a04b8c1585ccd333950e 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -187,7 +187,7 @@ class UserTest extends PHPUnit_Framework_TestCase
         $newlocalobject=new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
 
         return $localobject;
     }
@@ -301,7 +301,7 @@ class UserTest extends PHPUnit_Framework_TestCase
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach($aKeys as $sKey) {
-                if (in_array($sKey,$fieldstoignorearray)) 
+                if (in_array($sKey,$fieldstoignorearray))
                     continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);