Move locale update to after app has been enabled

Fixes issue #1779