Fixing bug that clobbers enterprise user fields