Scaffolded and merged entity User with the old facebook one