Inprove autentication (remove bug)