diff --git a/transporte/config.cfg.example b/transporte/config.cfg.example
index 97025eeecb4d165e27dc0a5d52cd3bc51dd6ba92..fdd71cffc261f4bb825bac929d1b4d6cf7b917d0 100644
--- a/transporte/config.cfg.example
+++ b/transporte/config.cfg.example
@@ -15,6 +15,7 @@ SPECIAL_HELPDESK_ACCOUNTS = [{
 }]
 
 # mail server config
+MAIL_ENABLE = True
 MAIL_SERVER = 'SMTP_HOST'
 MAIL_PORT = 587
 MAIL_USE_TLS = True
@@ -23,7 +24,8 @@ MAIL_USERNAME = 'SMTP_USER'
 MAIL_PASSWORD = 'SMTP_PASS'
 MAIL_DEFAULT_SENDER = 'no-reply@YOURDOMAIN.de'
 
-
+# zammad integration config
+ZAMMAD_ENABLE = True
 ZAMMAD_HOST = 'zammad host'
 ZAMMAD_USER = 'user'
 ZAMMAD_PASS = 'pass'
diff --git a/transporte/models.py b/transporte/models.py
index 4bf5738f2a0b9b482d02e36ff446555240c89951..ee53c285a52ccd02c160b4d01f90d0f467393865 100644
--- a/transporte/models.py
+++ b/transporte/models.py
@@ -36,16 +36,19 @@ class User(UserMixin, db.Model):
             return
 
         # send login email
-        msg = Message("Your LOC transport tool credentials!", recipients=[self.login])
-        msg.body = (
-            "Hi, na! \n\n"
-            "Thank you for helping us keeping an overview of your transports :) \n"
-            "Here is your login link: {}".format(
-                url_for("login_with_token", token=token, _external=True)
+        if app.config["MAIL_ENABLE"]:
+            msg = Message(
+                "Your LOC transport tool credentials!", recipients=[self.login]
+            )
+            msg.body = (
+                "Hi, na! \n\n"
+                "Thank you for helping us keeping an overview of your transports :) \n"
+                "Here is your login link: {}".format(
+                    url_for("login_with_token", token=token, _external=True)
+                )
             )
-        )
 
-        mail.send(msg)
+            mail.send(msg)
 
     @staticmethod
     def verify_login_token(token):
diff --git a/transporte/views.py b/transporte/views.py
index b5b5b0ea26280fbd6416ddeb802300e9e69470f6..c181304fa46f6786e19b9a483dfd9672451ba1b5 100644
--- a/transporte/views.py
+++ b/transporte/views.py
@@ -190,12 +190,13 @@ def edit_transport(id=None):
             #
             # if ticket is new, update object with zammad ticket id
             #
-            if transport.ticket_id is None:
-                transport.ticket_id = update_ticket(transport)
-                db.session.add(transport)
-                db.session.commit()
-            else:
-                update_ticket(transport)
+            if app.config["ZAMMAD_ENABLE"]:
+                if transport.ticket_id is None:
+                    transport.ticket_id = update_ticket(transport)
+                    db.session.add(transport)
+                    db.session.commit()
+                else:
+                    update_ticket(transport)
 
             for file in request.files.getlist("file_upload"):
                 if file.filename:
@@ -322,8 +323,9 @@ def mark_transport(mark, id=None):
         #
         # close ticket
         #
-        if transport.ticket_id:
-            close_ticket(transport, mark)
+        if app.config["ZAMMAD_ENABLE"]:
+            if transport.ticket_id:
+                close_ticket(transport, mark)
 
         db.session.add(transport)
         db.session.commit()