Refresh locale mapping after application enable

This is a cleaner PR and submitted against 2.1

Closes  #1779