Webconfig auth token fixes

Not yet tested, and it's against the wrong branch.  This is here for comments, and I'll update if needed.