Fix revoke and save