Allow option to select authentication mechanism #6385