Hybrid auth and cities addon compatibility issues

[ecomlabs]

Please try to apply the following fix

Cities addon install

Hi! Please try to apply the fix from the attached .diff and let me know if it helps. 3b6fa7f2ad1cebdbd46565f04967edad4e4d9a46.diff (1.9 KB)