Can't set default country after upgrade

[Pez]

I just upgraded from 1.6.0.9 to 1.6.1.5. My shop's default country is the UK, but in customer address area USA is selected by default.

 

In Localisation in BO, the default country is always set to UK. But if I change "Set language from browser" and "Set default country from browser language" to NO, they just go back to YES next time I look. I suspect that's why the wrong country is being selected by default in the addresses.

 

I tried clearing cache, using another browser etc, but nothing's working.

 

Is this a known bug? Is it something left over in the DB during upgrade that's causing this? Can anyone please help?

Edited April 24, 2016 by Pez (see edit history)

[NemoPS]

Sounds like there is a duplicate entry in the database.

ps_configuration table, look for

PS_DETECT_LANG

and

PS_DETECT_COUNTRY