Added setting for disabeling e-mail
Restructured