It seems we've had similar bug report / feature request somewhere. I am wondering if "don't include" bucket would be a general rule, or it actually depends.
It sounds like we may need to add, yet another check box, e.g. "include bucket name" if custom domain is selected, which user could deactivate.