fix CHECK_KEYSERVER for deprecated keys-from-userid as well