Fix Bug 877635 - update references to User.subdomain to User.username