CDB-2741 Fix error when creating new organization users