follow up to 849f43f1, refs #881

make sure email account activation required to register
Merge branch 'master' into integration