CAPX-88 | User and field bug fixes