Strip extra space in organization name earlier on

So it doesn’t propagate through the payment processing

Fixes #256