aff choose filed + fix intended route after login