Added Secret Question handling