Fixed the nil user issue, changed mail settings