Add some more settings to support email