admin email and confirmation email
merge
Merge branch 'reg22'