Feature - Polishing up

- fixes email setting