GCP-8403 replaced username with person name