Updated code to be able to use yahoo as default email adress