Fix up the authentication crap