Corrections to test email-functionality on server

I am doing these commits to be able to test my scripts on a server.