Changed some remaining emails to use Configuration instead