Fix for user fields upgrade

Fix for user fields upgrade