[Fix] Add Shift - Enable save button, validate after user taps save