Fixes for edition pref switching across domains

This fixes the AUS edition not being correctly set when being set from the US domain