diff --git a/app/factory.py b/app/factory.py
index dd2474ed83cba1f1b6c83243afafb27005b16379..7ffe7fc6b103d68e0385234584d26720d5ddae60 100644
--- a/app/factory.py
+++ b/app/factory.py
@@ -49,9 +49,10 @@ def create_app(config=None):
         # Send ERROR via mail
         from logging.handlers import SMTPHandler
         mail_handler = SMTPHandler(app.config['MAIL_SERVER'],
-                                   app.config['EMAIL_SENDER'],
-                                   app.config['ADMIN_EMAILS'],
-                                   'Inventory: ERROR raised')
+                                   fromaddr=app.config['EMAIL_SENDER'],
+                                   toaddrs=app.config['ADMIN_EMAILS'],
+                                   subject='Inventory: ERROR raised',
+                                   credentials=app.config['MAIL_CREDENTIALS'])
         mail_handler.setFormatter(logging.Formatter("""
             Message type:       %(levelname)s
             Location:           %(pathname)s:%(lineno)d
diff --git a/app/settings.py b/app/settings.py
index 1567bde5f1e03901f71ac3eb38abb6350db29d4d..3a7cc2adc5f06131077319e3b15a792f7dbf17c4 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -18,8 +18,9 @@ BOOTSTRAP_SERVE_LOCAL = True
 SECRET_KEY = (os.environ.get('SECRET_KEY') or
               b'\x0d\x11{\xd3\x13$\xeeel\xa6\xfb\x1d~\xfd\xb2\x9d\x16\x00\xfb5\xd64\xd4\xe0')
 MAIL_SERVER = 'mail.esss.lu.se'
+MAIL_CREDENTIALS = None
 ADMIN_EMAILS = ['admin@example.com']
-EMAIL_SENDER = 'inventory@esss.se'
+EMAIL_SENDER = 'noreply@esss.se'
 
 JWT_ACCESS_TOKEN_EXPIRES = timedelta(hours=12)