CLOUD-216 use userid instead of email in owner fields