Bug fix for locale set before login