Straighten up auth situation, fixes live server. Fixes #431