Making AUTHENTICATE optional