Attempting to fix the Email preferences refresh issue

Refactored Email Controller so that it hopefully no longer has the issue where the email preferences come back unchecked after submitting the form. See issue: 
https://jira.gutools.co.uk/browse/IDN-1803