Core-598 Mapped super-Admin user to Oauth Client