Improve registration workflow on private deployments

Solves issues with registration when a deploy has either or both confirmation emails and admin approval of users enabled.