! Rework converting profile fields to custom fields to prevent errors (fixes #2557)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>