Refactor des users