fixed a few things broken by the generic authentification