Added capturing the renew setting and making sure to add that to the
validation call if renew was true