fix some problems with settings/email