Merged in support for a real auth system, not a one-user DB kludge