BUG Fixed issue with locale being correctly set on locale screen