Support for non-profit partner and user ids