Refresh locale mapping after application enable

This is a cleaner PR and submitted against 2.1

Closes  #1779
I didn't want to 'rock the boat' so to speak. I just moved the existing locale update block.