CDB-3300 enforcing that if org is presente MUST be user's org name