Changed authorization refresh/obtain event handling slightly