Registration cancel fix