BS-9856 Fix Validation and Finish button behavior