This makes it mirror how it used to work and how the twig templates
work. The solution is not pretty, but the longer term solution is to
just get rid of the oldui exception.

Also actually run the existing EMail unit tests. That might have
caught this.

Closes: #1269