Fix bug when migrating current user fields