bugfix and email settings