Some fix around user auth and locales