Fixes #1661 - check all doesn't work
Merge pull request #1662 from ATofighi/fix-1661

Fixes #1661 - check all doesn't work
Fixes #1663 System Email Logs - pagination SQL error
Merge pull request #1664 from PaulBender/fix-1663

Fixes #1663 System Email Logs - pagination SQL error