Updated auth flow, fixed 37