Creating a new domain changes primary domain geo settings

This happens when you create a new domain and fill in the geolocalization info. The domain is created, but the geo info is applied to the primary domain instead of to the new domain.
Patch attached (also contains minor code cleanup).