Fix handling of user fields