Closes issue #1575
Minor Bugfixes for Starter Email Settings.