Item12952: minor tidy-up
Item12952: minor tidy-up
Item12952: some flawed logic in the setting of {EnableEmail}