Improve autentication (remove bug)