SCISOFT NCD: SCI-1610 fix masking issue and update user message