Fix Users persisting