API key saving improved