Added ability to define an account-email