User Fields Fix