Fix for user profile fields overwritten