Add check for domain on client