Change authorization flow to increase efficiency