Fixed saving mask on FirstSetupXtraForm

Issue #738