Redirect to login page from email links
Merge branch 'master' into mark-mods