Really fix non-required authentication