Fix cadre flow

-- Allow users to backtrack if stuck in other cadre flow