Teacher email & i18n fix