Merging: User secret answer should be required if the question is set -
TRUNK-3779 author:shubh