CDB-3506 Save extra fields on organization user edit