CLUB-581, cosmetics and fixes

resetDisabled was used here, but wasn't working and actually we want the button to be always active