Add support for user org custom fields

/cc @steved555