Remove PUBLIC site auth option (except admins); change NONE text

Fixes #2319