Fix the validation flow in the WSServer