Bug #605

Need to validate https in addition to http