fixes on authorization step