Correcting initial navigation flow and preventing unwanted infinite calls for access token