[WIP] [3.9] Replace User_Adapter object by User entity