refactor and keep email_locale around