Merge branch 'bug_synchro_underscore' into 'master'

Fix bug synchro quand underscore dans uid

See merge request !26