Fixing Auth flow