Don't lose Peter's bug fix. Having a leading space on an e-mail address doesn't seem to work on your branch.

Although I also can't add users in general on your branch (I get an error).