Fixes #6309: Fixes notify_user() broken by 63db31c
Merge pull request #6311 from mrclay/6309_fix

Fixes #6309: Fixes notify_user() broken by 63db31c
Fixes #6294 : Correct handling of email login
Prepare for 1.8.18 release
Merge pull request #6316 from gerard-kanters/patch-4

Fixes #6294 : Correct handling of email login before validation
Fixes incorrect commit c20c4e3
Merge pull request #6328 from mrclay/fix_6294

Fixes incorrect commit c20c4e3