Refactor settings, separate emailaddress and language