New authentication system (miss the upgrading)