improved handling of accountNumber
fixed sequencing of email config
fixed sequencing of email config
added 'repeat' handling, with tests