fixes & account for yahoo

I added another account-template, which will again require updates in the build request, so I leave this PR open till this is done.
Please close PR afterwards, thanks. :)