Bug fixed for i18n & auth