SCC-60 Added support for oAuth - ugly solution, needs to be changed