fixes #438 - automatically associate the host domain

This reverts a bahaviour prior to #398, the main difference
is that the domain will not be created, rather only existing
will be used.