Put the 'we will email you' message on site scans, not pages

Page scans will not send emails
Merge remote-tracking branch 'upstream/master'