diff --git a/README.md b/README.md
index 9b2a7c37..f338782b 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,6 @@ To deploy Mailtrain with Docker, you need the following three dependencies insta
 
 - [Docker](https://www.docker.com/)
 - [Docker Compose](https://docs.docker.com/compose/)
-- Git - Typically already present. If not, just use the package manager of your OS distribution to install it.
 
 These are the steps to start Mailtrain via docker-compose:
 
diff --git a/client/src/lib/styles.scss b/client/src/lib/styles.scss
index fbfb3543..6a9db9ff 100644
--- a/client/src/lib/styles.scss
+++ b/client/src/lib/styles.scss
@@ -78,7 +78,7 @@
 }
 
 .tableSelectTable.tableSelectTableHidden {
-  visibility: hidden;
+  display: none;
   height: 0px;
   margin-top: -15px;
 }
diff --git a/server/lib/mailers.js b/server/lib/mailers.js
index fb8768fe..ac81a040 100644
--- a/server/lib/mailers.js
+++ b/server/lib/mailers.js
@@ -173,7 +173,7 @@ async function _createTransport(sendConfiguration) {
             }
         };
 
-        if (mailerType === MailerType.ZONE_MTA || mailerSettings.zoneMTAType === ZoneMTAType.BUILTIN) {
+        if (mailerType === MailerType.ZONE_MTA && mailerSettings.zoneMTAType === ZoneMTAType.BUILTIN) {
             transportOptions.host = config.builtinZoneMTA.host;
             transportOptions.port = config.builtinZoneMTA.port;
             transportOptions.secure = false;
diff --git a/server/routes/subscription.js b/server/routes/subscription.js
index 7dd846b4..b37dea8b 100644
--- a/server/routes/subscription.js
+++ b/server/routes/subscription.js
@@ -183,7 +183,6 @@ async function _renderSubscribe(req, res, list, subscription) {
     const htmlRenderer = await tools.getTemplate(data.template, req.locale);
 
     data.isWeb = true;
-    data.needsJsWarning = true;
 
     data.flashMessages = await captureFlashMessages(res);
 
@@ -385,7 +384,6 @@ router.getAsync('/:lcid/manage/:ucid', passport.csrfProtection, async (req, res)
     const htmlRenderer = await tools.getTemplate(data.template, req.locale);
 
     data.isWeb = true;
-    data.needsJsWarning = true;
     data.isManagePreferences = true;
     data.flashMessages = await captureFlashMessages(res);
 
@@ -435,7 +433,6 @@ router.getAsync('/:lcid/manage-address/:ucid', passport.csrfProtection, async (r
     const htmlRenderer = await tools.getTemplate(data.template, req.locale);
 
     data.isWeb = true;
-    data.needsJsWarning = true;
     data.isManagePreferences = true;
     data.flashMessages = await captureFlashMessages(res);
 
@@ -535,7 +532,6 @@ router.getAsync('/:lcid/unsubscribe/:ucid', passport.csrfProtection, async (req,
         const htmlRenderer = await tools.getTemplate(data.template, req.locale);
 
         data.isWeb = true;
-        data.needsJsWarning = true;
         data.flashMessages = await captureFlashMessages(res);
 
         res.send(htmlRenderer(data));
diff --git a/server/views/subscription/partials/subscription-flash-messages.hbs b/server/views/subscription/partials/subscription-flash-messages.hbs
index d014cfc9..3ea515f3 100644
--- a/server/views/subscription/partials/subscription-flash-messages.hbs
+++ b/server/views/subscription/partials/subscription-flash-messages.hbs
@@ -1,8 +1 @@
 {{{flashMessages}}}
-
-{{#if needsJsWarning}}
-    <div class="alert alert-danger js-warning" role="alert">
-        <strong>{{#translate}}warning!{{/translate}}</strong>
-        {{#translate}}javaScriptMustBeEnabledInOrderForThis{{/translate}}
-    </div>
-{{/if}}