Remove requirement to supply email or key