This was a lot of code to be in a form and it's going to get even more complicated with email branding pools. Moving it out means we can also simplify the tests that target this code.