Adding a possibility the e-mail settings to be retreived from database too.