Tweaking authorization flow