Add workaround for supporting long CLI auth options