Core-1105 Added support for content Admin user