Add Michael Bauer to s033

And make the users module slightly less nasty while I'm at it...