[OFFAPPS-224] Refactor fields for current user / org function

:recycle: 

Refactor fields for current user / org function.

JIRA: https://zendesk.atlassian.net/browse/OFFAPPS-224

/cc @maximeprades