Updated SKipStep1 custom validation as per github comment