Fix with the authentication management