Actually allow joining a domain
Merge pull request #8630 from UtahDave/develop

Actually allow joining a domain