Rework authentification