Cancel calibration re-enables Next button

Fixes Issue #921